natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.0' into cassandra-3.11

This commit is contained in:
Stefan Miklosovic 2023-01-23 14:58:54 +01:00
parent 6f719f811a 357c0d5a89
commit f52b316016
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.build/build-rat.xml
View File

@ -27,7 +27,7 @@
</target> </target>
<target name="_build_ratinclude" depends="_rat_init"> <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"/> <arg line="ls-tree -r HEAD --name-only"/>
</exec> </exec>
<condition property="rat.skip" value="true"> <condition property="rat.skip" value="true">
@ -38,7 +38,7 @@
</target> </target>
<target name="_rat_copy_versioned_files" depends="_build_ratinclude" unless="${rat.skip}"> <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> <filterchain>
<linecontainsregexp> <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)$"/> <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" > <target name="rat-check" depends="_rat_copy_versioned_files" unless="${rat.skip}" description="License checks on source" >
<rat:report reportFile="${build.dir}/rat.txt"> <rat:report reportFile="${build.dir}/rat.txt">
<fileset dir="." includesfile="build/.ratinclude"> <fileset dir="." includesfile="${build.dir}/.ratinclude">
<!-- Config files with not much creativity --> <!-- Config files with not much creativity -->
<exclude name="**/ide/**/*"/> <exclude name="**/ide/**/*"/>
<exclude name="**/metrics-reporter-config-sample.yaml"/> <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"> <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> <condition>
<not> <not>
<available file="build/rat.txt" /> <available file="${build.dir}/rat.txt" />
</not> </not>
</condition> </condition>
</fail> </fail>

1
.gitignore vendored
View File

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

1
CHANGES.txt
View File

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