This is an automated email from the ASF dual-hosted git repository. samt pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 36a0f11221e19b8b21bd57f20e59d6eeb44af36f Merge: 9cda055 9449cd3 Author: Sam Tunnicliffe <[email protected]> AuthorDate: Tue Apr 27 12:01:30 2021 +0100 Merge branch 'cassandra-3.11' into trunk .build/build-rat.xml | 18 +++++++++++++++++- build.xml | 4 +--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --cc .build/build-rat.xml index 02f8750,54bd153..ce4e6f4 --- a/.build/build-rat.xml +++ b/.build/build-rat.xml @@@ -81,4 -92,29 +86,15 @@@ </condition> </fail> </target> + - <target name="_write_java_license_headers" depends="_rat_init"> - <java classname="org.apache.rat.Report" fork="true" - output="${build.dir}/rat-report.log"> - <classpath refid="rat.classpath" /> - <arg value="-a" /> - <arg value="--force" /> - <arg value="interface/thrift" /> - </java> - </target> - - <target name="write-java-license-headers" unless="without.rat" description="Add missing java license headers"> - <antcall target="_write_java_license_headers" /> - </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 --cc build.xml index 566604d,af3256d..347ab6e --- a/build.xml +++ b/build.xml @@@ -2056,9 -1914,7 +2055,8 @@@ <delete dir="build/eclipse-classes" /> </target> - - <target name="eclipse-warnings" depends="build, _assert_rat_output" description="Run eclipse compiler code analysis"> + <!-- 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}" /> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
