diff --git a/.build/build-rat.xml b/.build/build-rat.xml
index 02f8750657..ce4e6f4afb 100644
--- a/.build/build-rat.xml
+++ b/.build/build-rat.xml
@@ -27,9 +27,14 @@
     </target>
 
     <target name="_build_ratinclude" depends="_rat_init">
-        <exec executable="git" failifexecutionfails="true" failonerror="true" output="build/.versioned_files">
+        <exec executable="git" failifexecutionfails="false" failonerror="false" resultproperty="git.success" output="build/.versioned_files">
             <arg line="ls-tree -r HEAD --name-only"/>
         </exec>
+        <condition property="rat.skip" value="true">
+            <not>
+                <equals arg1="${git.success}" arg2="0"/>
+            </not>
+        </condition>
         <copy file="build/.versioned_files" tofile="build/.ratinclude">
             <filterchain>
                 <linecontainsregexp>
@@ -81,4 +86,15 @@
             </condition>
         </fail>
     </target>
+
+    <target name="_assert_rat_output">
+        <fail message="The rat report at build/rat.txt was not generated. Please ensure that the rat-check task is able to run successfully. For dev builds only, touch build/rat.txt to skip this check">
+            <condition>
+                <not>
+                    <available file="build/rat.txt" />
+                </not>
+            </condition>
+        </fail>
+    </target>
+
 </project>
diff --git a/build.xml b/build.xml
index 566604d3c7..347ab6e05a 100644
--- a/build.xml
+++ b/build.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -2056,9 +2055,8 @@
   	<delete dir="build/eclipse-classes" />
   </target>
 
-
   <!-- ECJ 4.6.1 in standalone mode does not work with JPMS, so we skip this target for Java 11 -->
-  <target name="eclipse-warnings" depends="build" description="Run eclipse compiler code analysis" if="java.version.8">
+  <target name="eclipse-warnings" depends="build, _assert_rat_output" description="Run eclipse compiler code analysis" if="java.version.8">
         <property name="ecj.log.dir" value="${build.dir}/ecj" />
         <property name="ecj.warnings.file" value="${ecj.log.dir}/eclipse_compiler_checks.txt"/>
         <mkdir  dir="${ecj.log.dir}" />