This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 14e89fc3c721ad1b7728ee665311d92cc37d8575
Merge: be0c563097 ce49e775f7
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Thu Aug 31 22:36:08 2023 +0200
Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
Missing license info and headers
.build/build-rat.xml | 85 ++++++++++++----------
.jenkins/Jenkinsfile | 13 ++--
build.properties.default | 19 +++++
conf/cassandra-jaas.config | 16 ++++
conf/jvm.options | 18 +++++
debian/cassandra.conf | 17 +++++
debian/cassandra.postinst | 17 +++++
debian/default | 17 +++++
debian/init | 16 ++++
debian/nodetool-completion | 15 ++++
debian/rules | 17 ++++-
pylib/cqlshlib/setup.cfg | 15 ++++
pylib/requirements.txt | 16 ++++
.../cassandra/cql3/functions/JavaSourceUDF.txt | 17 +++++
14 files changed, 253 insertions(+), 45 deletions(-)
diff --cc .build/build-rat.xml
index 3926660ad6,eb341c3024..93133dc63c
--- a/.build/build-rat.xml
+++ b/.build/build-rat.xml
@@@ -37,46 -37,55 +37,57 @@@
</condition>
</target>
- <target name="_rat_copy_versioned_files" depends="_build_ratinclude"
unless="${rat.skip}">
- <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)$"/>
- </linecontainsregexp>
- </filterchain>
- </copy>
- </target>
-
- <target name="rat-check" depends="_rat_copy_versioned_files"
unless="${rat.skip}" description="License checks on source" >
- <target name="rat-check" depends="_build_ratinclude" unless="${rat.skip}"
description="License checks on source" >
++ <target name="rat-check" depends="_build_ratinclude" unless="rat.skip"
description="License checks on source" >
<rat:report reportFile="${build.dir}/rat.txt">
<fileset dir="." includesfile="${build.dir}/.ratinclude">
- <!-- Config files with not much creativity -->
+ <!-- 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="**/doc/antora.yml"/>
- <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"/>
+ <exclude name="ide/**/*"/>
+ <exclude name="conf/metrics-reporter-config-sample.yaml"/>
+ <exclude name="**/cassandra*.yaml"/>
+ <exclude NAME="doc/antora.yml"/>
+ <exclude NAME="eclipse_compiler.properties"/>
+ <exclude name="test/conf/cdc.yaml"/>
+ <exclude
name="pylib/cqlshlib/test/config/sslhandling*.config"/>
- <exclude name="test/conf/commitlog_compression_*.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="tools/cqlstress-*.yaml"/>
+ <!-- test data -->
+ <exclude name="test/**/cassandra*.conf"/>
+ <exclude name="test/**/*.csv"/>
+ <exclude name="test/**/*.json"/>
+ <exclude name="test/**/*.txt"/>
+ <exclude name="test/data/**/*.adler32"/>
+ <exclude name="test/data/**/*.crc32"/>
+ <exclude name="test/data/**/CommitLog-*.log"/>
+ <exclude name="test/data/**/*.bin"/>
+ <exclude name="test/data/**/*.db"/>
+ <exclude name="test/data/**/*.sha1"/>
+ <exclude
name="test/data/CASSANDRA-15313/lz4-jvm-crash-failure.txt"/>
+ <exclude name="test/data/jmxdump/cassandra-*-jmx.yaml"/>
<!-- Documentation files -->
- <exclude NAME="**/doc/modules/**/*"/>
- <!-- NOTICE files -->
- <exclude NAME="**/NOTICE.md"/>
- <!-- LICENSE files -->
- <exclude NAME="**/LICENSE.md"/>
++ <exclude NAME="doc/modules/**/*"/>
+ <exclude NAME="src/java/**/*.md"/>
+ <exclude NAME="**/README*"/>
+ <exclude NAME="CHANGES.txt"/>
+ <exclude NAME="CASSANDRA-14092.txt"/>
+ <!-- legal files -->
+ <exclude NAME="NOTICE.txt"/>
+ <exclude NAME="LICENSE.txt"/>
+ <!-- misc -->
+ <exclude NAME="**/*.patch"/>
+ <exclude NAME="**/*.dpatch"/>
+ <exclude NAME="**/*.diff"/>
+ <exclude NAME="debian/TODO"/>
+ <exclude NAME="debian/cassandra.bash-completion"/>
+ <exclude NAME="debian/cassandra-sysctl.conf"/>
+ <exclude NAME="debian/cassandra.install"/>
+ <exclude NAME="debian/cassandra-tools.install"/>
+ <exclude NAME="debian/compat"/>
+ <exclude NAME="debian/control"/>
+ <exclude NAME="debian/dirs"/>
+ <exclude NAME="debian/patches/00list"/>
</fileset>
</rat:report>
<exec executable="grep" outputproperty="rat.failed.files"
failifexecutionfails="false">
diff --cc conf/cassandra-jaas.config
index f3a9bf7055,0000000000..e636ca544d
mode 100644,000000..100644
--- a/conf/cassandra-jaas.config
+++ b/conf/cassandra-jaas.config
@@@ -1,4 -1,0 +1,20 @@@
++// Licensed to the Apache Software Foundation (ASF) under one
++// or more contributor license agreements. See the NOTICE file
++// distributed with this work for additional information
++// regarding copyright ownership. The ASF licenses this file
++// to you under the Apache License, Version 2.0 (the
++// "License"); you may not use this file except in compliance
++// with the License. You may obtain a copy of the License at
++//
++// http://www.apache.org/licenses/LICENSE-2.0
++//
++// Unless required by applicable law or agreed to in writing, software
++// distributed under the License is distributed on an "AS IS" BASIS,
++// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++// Se# Licensed to the Apache Software Foundation (ASF) under onee the
License for the specific language governing permissions and
++// limitations under the License.
++//
+// Delegates authentication to Cassandra's configured IAuthenticator
+CassandraLogin {
+ org.apache.cassandra.auth.CassandraLoginModule REQUIRED;
+};
diff --cc debian/cassandra.conf
index 72ede9ed0b,d310d78f2c..6e3eefb59b
--- a/debian/cassandra.conf
+++ b/debian/cassandra.conf
@@@ -1,3 -1,19 +1,20 @@@
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements. See the NOTICE file
+ # distributed with this work for additional information
+ # regarding copyright ownership. The ASF licenses this file
+ # to you under the Apache License, Version 2.0 (the
+ # "License"); you may not use this file except in compliance
+ # with the License. You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ #
++#
# Provided by the cassandra package
cassandra - memlock unlimited
cassandra - nofile 100000
diff --cc debian/cassandra.postinst
index 752ff1f6bb,5862036efe..d5598aa199
--- a/debian/cassandra.postinst
+++ b/debian/cassandra.postinst
@@@ -1,4 -1,20 +1,21 @@@
#!/bin/sh
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements. See the NOTICE file
+ # distributed with this work for additional information
+ # regarding copyright ownership. The ASF licenses this file
+ # to you under the Apache License, Version 2.0 (the
+ # "License"); you may not use this file except in compliance
+ # with the License. You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ #
++#
# postinst script for cassandra
set -e
diff --cc debian/default
index 1b56a980fd,1700a2dc28..4396aa9637
--- a/debian/default
+++ b/debian/default
@@@ -1,3 -1,19 +1,20 @@@
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements. See the NOTICE file
+ # distributed with this work for additional information
+ # regarding copyright ownership. The ASF licenses this file
+ # to you under the Apache License, Version 2.0 (the
+ # "License"); you may not use this file except in compliance
+ # with the License. You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ #
++#
# NOTICE: See also /etc/cassandra/cassandra-env.sh
# EXTRA_CLASSPATH provides the means to extend Cassandra's classpath with
diff --cc debian/init
index 79a9a52e94,4f3f4370d4..733ec9d4e8
--- a/debian/init
+++ b/debian/init
@@@ -1,4 -1,20 +1,20 @@@
#! /bin/sh
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements. See the NOTICE file
+ # distributed with this work for additional information
+ # regarding copyright ownership. The ASF licenses this file
+ # to you under the Apache License, Version 2.0 (the
+ # "License"); you may not use this file except in compliance
+ # with the License. You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
-#
++
### BEGIN INIT INFO
# Provides: cassandra
# Required-Start: $remote_fs $network $named $time
diff --cc debian/nodetool-completion
index 732f4f4fce,4318eb941d..40830cccb4
--- a/debian/nodetool-completion
+++ b/debian/nodetool-completion
@@@ -1,3 -1,19 +1,18 @@@
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements. See the NOTICE file
+ # distributed with this work for additional information
+ # regarding copyright ownership. The ASF licenses this file
+ # to you under the Apache License, Version 2.0 (the
+ # "License"); you may not use this file except in compliance
+ # with the License. You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
-#
have nodetool && have cqlsh &&
{
diff --cc pylib/cqlshlib/setup.cfg
index 6c523ee93e,4b405c542d..51f1e6aa2f
--- a/pylib/cqlshlib/setup.cfg
+++ b/pylib/cqlshlib/setup.cfg
@@@ -1,3 -1,19 +1,18 @@@
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements. See the NOTICE file
+ # distributed with this work for additional information
+ # regarding copyright ownership. The ASF licenses this file
+ # to you under the Apache License, Version 2.0 (the
+ # "License"); you may not use this file except in compliance
+ # with the License. You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
-#
[nosetests]
verbosity=3
detailed-errors=1
diff --cc pylib/requirements.txt
index a9b62177f5,d3ca29f34d..b177be80df
--- a/pylib/requirements.txt
+++ b/pylib/requirements.txt
@@@ -1,3 -1,20 +1,19 @@@
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements. See the NOTICE file
+ # distributed with this work for additional information
+ # regarding copyright ownership. The ASF licenses this file
+ # to you under the Apache License, Version 2.0 (the
+ # "License"); you may not use this file except in compliance
+ # with the License. You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ #
-#
# See python driver docs: futures and six have to be installed before
# cythonizing the driver, perhaps only on old pips.
#
http://datastax.github.io/python-driver/installation.html#cython-based-extensions
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
