You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2021/04/27 08:36:24 UTC
[cassandra] 02/02: Merge branch 'cassandra-2.2' into cassandra-3.0
This is an automated email from the ASF dual-hosted git repository.
samt pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit ad2f41ef88784cd4fa0073688a247ebd2b77dd89
Merge: e9cf21b 5be6d7e
Author: Sam Tunnicliffe <sa...@beobal.com>
AuthorDate: Tue Apr 27 09:08:44 2021 +0100
Merge branch 'cassandra-2.2' into cassandra-3.0
.build/build-rat.xml | 99 ++++++++++++++++++++++++++++------------------------
build.xml | 32 ++++++++---------
2 files changed, 68 insertions(+), 63 deletions(-)
diff --cc .build/build-rat.xml
index 468c671,730899b..fd1b0f3
--- a/.build/build-rat.xml
+++ b/.build/build-rat.xml
@@@ -37,34 -32,46 +32,46 @@@
<typedef uri="antlib:org.apache.rat.anttasks" classpathref="rat.classpath"/>
</target>
- <target name="rat-check" depends="_rat_init" if="${rat.enabled}" description="License checks on source" >
+ <target name="_build_ratinclude" depends="_rat_init">
+ <exec executable="git" failifexecutionfails="true" failonerror="true" output="build/.versioned_files">
+ <arg line="ls-tree -r HEAD --name-only"/>
+ </exec>
+ <copy file="build/.versioned_files" tofile="build/.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)$"/>
+ </linecontainsregexp>
+ </filterchain>
+ </copy>
+ </target>
+
+ <target name="rat-check" depends="_build_ratinclude" unless="${rat.skip}" description="License checks on source" >
<rat:report reportFile="${build.dir}/rat.txt">
- <fileset dir="."
- includes="**/*.java,**/*.py,**/*.sh,**/.xml,**/*.spec,**/*.md,**/*.iml,**/*.bat,**/*.btm,**/*.cql,**/*.css,**/*.g,**/*.hmtl,**/*.jflex,**/*.jks,**/*.mod,**/*.name,**/*.pom,**/*.textile,**/*.yml,**/*.yaml,**/*.HIGHRES,**/*.LOWRES"
- excludesfile=".gitignore">
- <!-- Config files with not much creativity -->
- <exclude name="**/metrics-reporter-config-sample.yaml"/>
- <exclude name="**/cassandra.yaml"/>
- <exclude name="**/cassandra-murmur.yaml"/>
- <exclude name="**/cassandra-seeds.yaml"/>
- <exclude name="**/test/conf/cassandra.yaml"/>
- <exclude name="**/test/conf/cassandra_encryption.yaml"/>
- <exclude name="**/test/conf/cdc.yaml"/>
- <exclude name="**/test/conf/commitlog_compression_LZ4.yaml"/>
- <exclude name="**/test/conf/commitlog_compression_Zstd.yaml"/>
- <exclude name="**/test/conf/system_keyspaces_directory.yaml"/>
- <exclude name="**/test/conf/unit-test-conf/test-native-port.yaml"/>
- <exclude name="**/test/data/jmxdump/cassandra-3.0-jmx.yaml"/>
- <exclude name="**/test/data/jmxdump/cassandra-3.11-jmx.yaml"/>
- <exclude name="**/test/data/jmxdump/cassandra-4.0-jmx.yaml"/>
- <exclude name="**/tools/cqlstress-counter-example.yaml"/>
- <exclude name="**/tools/cqlstress-example.yaml"/>
- <exclude name="**/tools/cqlstress-insanity-example.yaml"/>
- <exclude name="**/tools/cqlstress-lwt-example.yaml"/>
- <!-- NOTICE files -->
- <exclude NAME="**/NOTICE.md"/>
- <!-- LICENSE files -->
- <exclude NAME="**/LICENSE.md"/>
- <fileset dir="." includesfile="build/.ratinclude" >
- <!-- Config files with not much creativity -->
- <exclude name="**/ide/**/*"/>
- <exclude name="**/metrics-reporter-config-sample.yaml"/>
- <exclude name="**/cassandra.yaml"/>
- <exclude name="**/cassandra-murmur.yaml"/>
- <exclude name="**/cassandra-seeds.yaml"/>
- <exclude name="**/test/conf/cassandra.yaml"/>
- <exclude name="**/test/conf/cassandra_encryption.yaml"/>
- <exclude name="**/test/conf/cdc.yaml"/>
- <exclude name="**/test/conf/commitlog_compression_LZ4.yaml"/>
- <exclude name="**/test/conf/commitlog_compression_Zstd.yaml"/>
- <exclude name="**/test/conf/system_keyspaces_directory.yaml"/>
- <exclude name="**/test/conf/unit-test-conf/test-native-port.yaml"/>
- <exclude name="**/test/data/jmxdump/cassandra-3.0-jmx.yaml"/>
- <exclude name="**/test/data/jmxdump/cassandra-3.11-jmx.yaml"/>
- <exclude name="**/test/data/jmxdump/cassandra-4.0-jmx.yaml"/>
- <exclude name="**/tools/cqlstress-counter-example.yaml"/>
- <exclude name="**/tools/cqlstress-example.yaml"/>
- <exclude name="**/tools/cqlstress-insanity-example.yaml"/>
- <exclude name="**/tools/cqlstress-lwt-example.yaml"/>
- <!-- NOTICE files -->
- <exclude NAME="**/NOTICE.md"/>
- <!-- LICENSE files -->
- <exclude NAME="**/LICENSE.md"/>
++ <fileset dir="." includesfile="build/.ratinclude">
++ <!-- Config files with not much creativity -->
++ <exclude name="**/ide/**/*"/>
++ <exclude name="**/metrics-reporter-config-sample.yaml"/>
++ <exclude name="**/cassandra.yaml"/>
++ <exclude name="**/cassandra-murmur.yaml"/>
++ <exclude name="**/cassandra-seeds.yaml"/>
++ <exclude name="**/test/conf/cassandra.yaml"/>
++ <exclude name="**/test/conf/cassandra_encryption.yaml"/>
++ <exclude name="**/test/conf/cdc.yaml"/>
++ <exclude name="**/test/conf/commitlog_compression_LZ4.yaml"/>
++ <exclude name="**/test/conf/commitlog_compression_Zstd.yaml"/>
++ <exclude name="**/test/conf/system_keyspaces_directory.yaml"/>
++ <exclude name="**/test/conf/unit-test-conf/test-native-port.yaml"/>
++ <exclude name="**/test/data/jmxdump/cassandra-3.0-jmx.yaml"/>
++ <exclude name="**/test/data/jmxdump/cassandra-3.11-jmx.yaml"/>
++ <exclude name="**/test/data/jmxdump/cassandra-4.0-jmx.yaml"/>
++ <exclude name="**/tools/cqlstress-counter-example.yaml"/>
++ <exclude name="**/tools/cqlstress-example.yaml"/>
++ <exclude name="**/tools/cqlstress-insanity-example.yaml"/>
++ <exclude name="**/tools/cqlstress-lwt-example.yaml"/>
++ <!-- NOTICE files -->
++ <exclude NAME="**/NOTICE.md"/>
++ <!-- LICENSE files -->
++ <exclude NAME="**/LICENSE.md"/>
</fileset>
</rat:report>
<exec executable="grep" outputproperty="rat.failed.files" failifexecutionfails="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org