Merge branch 'cassandra-3.0' into cassandra-3.11

* cassandra-3.0:
  Missing license info and headers

.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.dir}/.versioned_files">
+        <exec executable="git" failifexecutionfails="false" failonerror="false" resultproperty="git.success" output="${build.dir}/.ratinclude">
             <arg line="ls-tree -r HEAD --name-only"/>
         </exec>
         <condition property="rat.skip" value="true">
@@ -37,46 +37,57 @@
         </condition>
     </target>
 
-    <target name="_rat_copy_versioned_files" depends="_build_ratinclude" unless="${rat.skip}">
+    <target name="rat-check" depends="_build_ratinclude" unless="rat.skip" description="License checks on source" >
-        <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" >
         <rat:report reportFile="${build.dir}/rat.txt">
             <fileset dir="." includesfile="${build.dir}/.ratinclude">
                  <!-- Config files with not much creativity -->
-                 <exclude name="**/ide/**/*"/>
+                 <exclude name="ide/**/*"/>
-                 <exclude name="**/metrics-reporter-config-sample.yaml"/>
+                 <exclude name="conf/metrics-reporter-config-sample.yaml"/>
-                 <exclude name="**/cassandra.yaml"/>
+                 <exclude name="**/cassandra*.yaml"/>
-                 <exclude name="**/cassandra-murmur.yaml"/>
+                 <exclude NAME="doc/antora.yml"/>
-                 <exclude name="**/cassandra-seeds.yaml"/>
+                 <exclude NAME="eclipse_compiler.properties"/>
-                 <exclude NAME="**/doc/antora.yml"/>
+                 <exclude name="test/conf/cdc.yaml"/>
-                 <exclude name="**/test/conf/cassandra.yaml"/>
+                 <exclude name="pylib/cqlshlib/test/config/sslhandling*.config"/>
-                 <exclude name="**/test/conf/cassandra_encryption.yaml"/>
+                 <exclude name="test/conf/commitlog_compression_LZ4.yaml"/>
-                 <exclude name="**/test/conf/cdc.yaml"/>
+                 <exclude name="test/conf/commitlog_compression_Zstd.yaml"/>
-                 <exclude name="**/test/conf/commitlog_compression_LZ4.yaml"/>
+                 <exclude name="test/conf/system_keyspaces_directory.yaml"/>
-                 <exclude name="**/test/conf/commitlog_compression_Zstd.yaml"/>
+                 <exclude name="test/conf/unit-test-conf/test-native-port.yaml"/>
-                 <exclude name="**/test/conf/system_keyspaces_directory.yaml"/>
+                 <exclude name="tools/cqlstress-*.yaml"/>
-                 <exclude name="**/test/conf/unit-test-conf/test-native-port.yaml"/>
+                 <!-- test data -->
-                 <exclude name="**/test/data/jmxdump/cassandra-3.0-jmx.yaml"/>
+                 <exclude name="test/**/cassandra*.conf"/>
-                 <exclude name="**/test/data/jmxdump/cassandra-3.11-jmx.yaml"/>
+                 <exclude name="test/**/*.csv"/>
-                 <exclude name="**/test/data/jmxdump/cassandra-4.0-jmx.yaml"/>
+                 <exclude name="test/**/*.json"/>
-                 <exclude name="**/tools/cqlstress-counter-example.yaml"/>
+                 <exclude name="test/**/*.txt"/>
-                 <exclude name="**/tools/cqlstress-example.yaml"/>
+                 <exclude name="test/data/**/*.adler32"/>
-                 <exclude name="**/tools/cqlstress-insanity-example.yaml"/>
+                 <exclude name="test/data/**/*.crc32"/>
-                 <exclude name="**/tools/cqlstress-lwt-example.yaml"/>
+                 <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/**/*"/>
+                 <exclude NAME="doc/modules/**/*"/>
-                 <!-- NOTICE files -->
+                 <exclude NAME="src/java/**/*.md"/>
-                 <exclude NAME="**/NOTICE.md"/>
+                 <exclude NAME="**/README*"/>
-                 <!-- LICENSE files -->
+                 <exclude NAME="CHANGES.txt"/>
-                 <exclude NAME="**/LICENSE.md"/>
+                 <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">

.jenkins/Jenkinsfile

@@ -6,14 +6,13 @@
 // "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
 //
-//    https://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 //
-// Unless required by applicable law or agreed to in writing,
+// Unless required by applicable law or agreed to in writing, software
-// software distributed under the License is distributed on an
+// distributed under the License is distributed on an "AS IS" BASIS,
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// KIND, either express or implied.  See the License for the
+// Se# Licensed to the Apache Software Foundation (ASF) under onee the License for the specific language governing permissions and
-// specific language governing permissions and limitations
+// limitations under the License.
-// under the License.
 //
 //
 // Jenkins declaration of how to build and test the current codebase.

build.properties.default

@@ -1,4 +1,23 @@
+#
+# 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.
+#
+#
 # Maven2 Repository Locations (you can override these in "build.properties" to point to a local proxy, e.g. Nexus)
+#
 artifact.remoteRepository.central:     https://repo1.maven.org/maven2
 artifact.remoteRepository.apache:      https://repo.maven.apache.org/maven2
 

conf/cassandra-jaas.config

@@ -1,3 +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.
+// 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;

conf/jvm.options

@@ -1,3 +1,21 @@
+#
+# 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.
+#
+#
 ###########################################################################
 #                             jvm.options                                 #
 #                                                                         #

debian/cassandra.conf

@@ -1,3 +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

debian/cassandra.postinst

@@ -1,4 +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

debian/default

@@ -1,3 +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

debian/init

@@ -1,4 +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

debian/nodetool-completion

@@ -1,3 +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 &&
 {
 

debian/rules

@@ -1,5 +1,20 @@
 #!/usr/bin/make -f
-
+# 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.
+#
 # Uncomment to enable verbose mode.
 #export DH_VERBOSE=1
 

pylib/cqlshlib/setup.cfg

@@ -1,3 +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

pylib/requirements.txt

@@ -1,3 +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

src/resources/org/apache/cassandra/cql3/functions/JavaSourceUDF.txt

@@ -1,3 +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.
+ */
 package #package_name#;
 
 import java.nio.ByteBuffer;