Merge branch 'cassandra-3.0' into cassandra-3.11

.build/build-rat.xml

@@ -27,7 +27,7 @@
     </target>
 
     <target name="_build_ratinclude" depends="_rat_init">
-        <exec executable="git" failifexecutionfails="false" failonerror="false" resultproperty="git.success" output="build/.versioned_files">
+        <exec executable="git" failifexecutionfails="false" failonerror="false" resultproperty="git.success" output="${build.dir}/.versioned_files">
             <arg line="ls-tree -r HEAD --name-only"/>
         </exec>
         <condition property="rat.skip" value="true">
@@ -38,7 +38,7 @@
     </target>
 
     <target name="_rat_copy_versioned_files" depends="_build_ratinclude" unless="${rat.skip}">
-        <copy file="build/.versioned_files" tofile="build/.ratinclude">
+        <copy file="${build.dir}/.versioned_files" tofile="${build.dir}/.ratinclude">
             <filterchain>
                 <linecontainsregexp>
                     <regexp pattern=".*\.(java|py|sh|xml|spec|md|iml|bat|btm|cql|css|g|html|jflex|jks|mod|name|pom|textile|yml|yaml|MIDRES|HIGHRES|LOWRES)$"/>
@@ -49,7 +49,7 @@
 
     <target name="rat-check" depends="_rat_copy_versioned_files" unless="${rat.skip}" description="License checks on source" >
         <rat:report reportFile="${build.dir}/rat.txt">
-            <fileset dir="." includesfile="build/.ratinclude">
+            <fileset dir="." includesfile="${build.dir}/.ratinclude">
                  <!-- Config files with not much creativity -->
                  <exclude name="**/ide/**/*"/>
                  <exclude name="**/metrics-reporter-config-sample.yaml"/>
@@ -111,7 +111,7 @@
         <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" />
+                    <available file="${build.dir}/rat.txt" />
                 </not>
             </condition>
         </fail>

.gitignore

@@ -1,6 +1,7 @@
 .gitignore
 
 # C*
+build
 build/
 src/gen-java/
 src/resources/org/apache/cassandra/config/

CHANGES.txt

@@ -1,6 +1,7 @@
 3.11.15
  * Fix Splitter sometimes creating more splits than requested (CASSANDRA-18013)
 Merged from 3.0:
+ * Expand build.dir property in rat targets (CASSANDRA-18183)
  * Suppress CVE-2022-41881 (CASSANDRA-18148)
  * Default role is created with zero timestamp (CASSANDRA-12525)
  * Suppress CVE-2021-37533 (CASSANDRA-18146)