Attachment #231019 for bug #261220

Lines 1-7 Link Here

(-)Makefile (-4 / +7 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= cassandra	3	PORTNAME= cassandra
4	DISTVERSION= 3.11.10	4	DISTVERSION= 3.11.11
5	CATEGORIES= databases java	5	CATEGORIES= databases java
6	MASTER_SITES= LOCAL/nc:repo	6	MASTER_SITES= LOCAL/nc:repo
7	PKGNAMESUFFIX= 3	7	PKGNAMESUFFIX= 3
Lines 29-35 Link Here
29	USE_GITHUB= yes	29	USE_GITHUB= yes
30	GH_ACCOUNT= polo-language	30	GH_ACCOUNT= polo-language
31	GH_PROJECT= cassandra	31	GH_PROJECT= cassandra
32	GH_TAGNAME= 62fe1f7	32	GH_TAGNAME= 84496b0
33		33
34	TEST_TARGET= test	34	TEST_TARGET= test
35		35
Lines 78-91 Link Here
78	sstableutil \	78	sstableutil \
79	sstableverify	79	sstableverify
80		80
		81	ANT_OPTS_LOCAL= ${ANT_OPTS} -Xmx512m
		82
81	post-patch:	83	post-patch:
82	@${CHMOD} ug+x ${WRKSRC}/pylib/cassandra-cqlsh-tests.sh	84	@${CHMOD} ug+x ${WRKSRC}/pylib/cassandra-cqlsh-tests.sh
		85	@${REINPLACE_CMD} -e 's\|$${user.home}/.m2/repository/\|$${localm2}/\|g' ${WRKSRC}/.build/build-resolver.xml
83		86
84	do-build:	87	do-build:
85	@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.	88	@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.
86		89
87	do-build-DOCS-on:	90	do-build-DOCS-on:
88	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS} -Xmx512m" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} -Dpycmd=${PYTHON_CMD} freebsd-stage-doc	91	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS_LOCAL}" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} -Dpycmd=${PYTHON_CMD} freebsd-stage-doc
89		92
90	do-build-DOCS-off:	93	do-build-DOCS-off:
91	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS} -Xmx512m" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} freebsd-stage	94	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS} -Xmx512m" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} freebsd-stage
Lines 136-142 Link Here
136	# A bare 'python' must be on PATH for test to succeed.	139	# A bare 'python' must be on PATH for test to succeed.
137	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh bin/cassandra.in.sh.patched	140	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh bin/cassandra.in.sh.patched
138	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh.orig bin/cassandra.in.sh	141	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh.orig bin/cassandra.in.sh
139	@cd ${WRKSRC} && pylib/cassandra-cqlsh-tests.sh ${WRKSRC} python3 ${JAVA_HOME} ${REPO_DIR} ${PYTHON_CMD}	142	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS_LOCAL}" ANT_CMD="${ANT}" pylib/cassandra-cqlsh-tests.sh ${WRKSRC} ${JAVA_HOME} ${REPO_DIR} ${PYTHON_CMD} ${REPO_DIR}
140	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh bin/cassandra.in.sh.orig	143	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh bin/cassandra.in.sh.orig
141	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh.patched bin/cassandra.in.sh	144	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh.patched bin/cassandra.in.sh
142		145

Lines 1-5 Link Here

(-)distinfo (-5 / +5 lines)
1	TIMESTAMP = 1612608662	1	TIMESTAMP = 1642239227
2	SHA256 (apache-cassandra-3.11.10-repo.tar.gz) = 09e154d4db06007c58193be4869346263e16c4eeb5bc42d9fb5f5165ce5ad4dc	2	SHA256 (apache-cassandra-3.11.11-repo.tar.gz) = 585ae7ce7bc1e2edc534c5c36f982c6e712d5e9716e1c6376638a16306f30d7d
3	SIZE (apache-cassandra-3.11.10-repo.tar.gz) = 52449193	3	SIZE (apache-cassandra-3.11.11-repo.tar.gz) = 55148770
4	SHA256 (polo-language-cassandra-3.11.10-62fe1f7_GH0.tar.gz) = 7c9624aa1287007cc858cb95e96d2e8a88ba7997332a8093ed90688aff4789f6	4	SHA256 (polo-language-cassandra-3.11.11-84496b0_GH0.tar.gz) = 4271a3336cfd745674f8bf3ca7ebd4b5cf9be2570aa1e69821d2cb370e018f07
5	SIZE (polo-language-cassandra-3.11.10-62fe1f7_GH0.tar.gz) = 35636492	5	SIZE (polo-language-cassandra-3.11.11-84496b0_GH0.tar.gz) = 12786216




--- .build/build-resolver.xml.orig	2022-01-03 17:11:14 UTC
+++ .build/build-resolver.xml
@@ -182,7 +182,7 @@
 
         <!-- files.pythonhosted.org -->
         <get src="https://files.pythonhosted.org/packages/59/a0/cf4cd997e1750f0c2d91c6ea5abea218251c43c3581bcc2f118b00baf5cf/futures-2.1.6-py2.py3-none-any.whl" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
-        <get src="https://files.pythonhosted.org/packages/2e/a4/6dcb84af409b7bc0c258a0d6bd7e14231724d9a46b750c048f09d74d870c/six-1.7.3-py2.py3-none-any.whl" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/six-1.7.3-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
+        <get src="https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl" dest="${localm2}/org/apache/cassandra/deps/six-1.16.0-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
 
         <!-- python-driver -->
         <get src="https://raw.githubusercontent.com/apache/cassandra/${lib.download.sha}/lib/cassandra-driver-internal-only-3.11.0-bb96859b.zip" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/cassandra-driver-internal-only-3.11.0-bb96859b.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
@@ -216,7 +216,7 @@
         <copy todir="${build.lib}" quiet="true">
             <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip"/>
             <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/cassandra-driver-internal-only-3.11.0-bb96859b.zip"/>
-            <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/six-1.7.3-py2.py3-none-any.zip"/>
+            <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/six-1.16.0-py2.py3-none-any.zip"/>
         </copy>
         <copy todir="${build.lib}/sigar-bin/" quiet="true">
             <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-freebsd-6.so"/>
@@ -243,4 +243,4 @@
             <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/sigar-x86-winnt.lib"/>
         </copy>
     </target>
-</project>
\ No newline at end of file
+</project>




--- build.xml.orig	2021-07-25 16:37:33 UTC
+++ build.xml
@@ -20,6 +20,8 @@
     <property file="build.properties" />
     <property file="build.properties.default" />
     <property name="debuglevel" value="source,lines,vars"/>
+    <property name="pycmd" value="python"/>
+    <property name="rat.skip" value="true"/>
 
     <!-- default version and SCM information -->
     <property name="base.version" value="3.11.11"/>
@@ -74,14 +76,14 @@
     <condition property="version" value="${base.version}">
       <isset property="release"/>
     </condition>

     <property name="maven-ant-tasks.url"
               value="https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks" />
     <!-- details of how and which Maven repository we publish to -->
@@ -253,6 +255,7 @@
     <target name="gen-doc" description="Generate documentation" depends="jar" unless="ant.gen-doc.skip">
             <dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
             <dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>
-            <remoteRepository refid="central"/>
-            <remoteRepository refid="apache"/>
+            <localRepository path="${localm2}"/>
         </artifact:dependencies>
         <taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
         <wikitext-to-html markupLanguage="Textile">
@@ -261,6 +261,7 @@
     <target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation">
         <exec executable="make" osfamily="unix" dir="${doc.dir}">
             <arg value="html"/>
+            <arg value="PYTHON_CMD=${pycmd}"/>

         </exec>
         <exec executable="cmd" osfamily="dos" dir="${doc.dir}">
             <arg value="/c"/>
@@ -894,6 +897,88 @@
             description="Initialize Maven ANT Tasks">
       <typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
 
-      <!-- define the remote repositories we use -->
-      <artifact:remoteRepository id="central"   url="${artifact.remoteRepository.central}"/>
-      <artifact:remoteRepository id="apache"    url="${artifact.remoteRepository.apache}"/>
-
       <macrodef name="install">
         <attribute name="pomFile"/>
         <attribute name="file"/>
@@ -706,16 +703,14 @@
                              filesetId="build-dependency-jars"
                              cacheDependencyRefs="true"
                              dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">
-          <remoteRepository refid="central"/>
-          <remoteRepository refid="apache"/>
+          <localRepository path="${localm2}"/>
       </artifact:dependencies>
       <!-- retrieve -source.jar artifacts using the reference-pom with the artifacts that have these -->
       <artifact:dependencies pomRefId="build-deps-pom-sources"
                              sourcesFilesetId="build-dependency-sources"
                              cacheDependencyRefs="true"
                              dependencyRefsBuildFile="${build.dir}/build-dependencies-sources.xml">
-          <remoteRepository refid="central"/>
-          <remoteRepository refid="apache"/>
+          <localRepository path="${localm2}"/>
       </artifact:dependencies>
       <copy todir="${build.dir.lib}/jars">
           <fileset refid="build-dependency-jars"/>
@@ -728,7 +723,7 @@
       <!-- code coverage tools -->
       <artifact:dependencies pomRefId="coverage-deps-pom"
                              filesetId="coverage-dependency-jars">
-          <remoteRepository refid="central"/>
+          <localRepository path="${localm2}"/>
       </artifact:dependencies>
       <copy todir="${build.dir.lib}/jars">
           <fileset refid="coverage-dependency-jars"/>
@@ -749,8 +744,7 @@
                              sourcesFilesetId="test-dependency-sources"
                              cacheDependencyRefs="true"
                              dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">
-        <remoteRepository refid="apache"/>
-        <remoteRepository refid="central"/>
+        <localRepository path="${localm2}"/>
       </artifact:dependencies>
       <copy todir="${test.lib}/jars">
         <fileset refid="test-dependency-jars"/>
@@ -1045,6 +1039,88 @@
       </jar>
     </target>
 

+    </target>
+    
     <!-- creates release tarballs -->
     <target name="artifacts" depends="jar,gen-doc,build-test,stress-build-test,sources-jar,javadoc-jar"
             description="Create Cassandra release artifacts">
@@ -1644,8 +1720,7 @@
   <target name="rat-init" depends="maven-ant-tasks-init">
     <artifact:dependencies pathId="rat.classpath">
       <dependency groupId="org.apache.rat" artifactId="apache-rat-tasks" version="0.6" />
-      <remoteRepository refid="central"/>
-      <remoteRepository refid="apache"/>
+      <localRepository path="${localm2}"/>
     </artifact:dependencies>
     <typedef uri="antlib:org.apache.rat.anttasks" classpathref="rat.classpath"/>
   </target>
@@ -1794,8 +1869,8 @@
     <exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
       <arg value="--all"/>
     </exec>
-    <!-- support for Mac OS X -->
-    <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
+    <!-- support for Mac OS X and FreeBSD -->
+    <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin,FreeBSD" failifexecutionfails="false">
       <arg value="-n"/>
       <arg value="hw.ncpu"/>
     </exec>
@@ -1815,6 +1890,11 @@
     <exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
       <arg value="-n"/>
       <arg value="hw.memsize"/>
+    </exec>
+    <!-- support for FreeBSD -->
+    <exec executable="sysctl" outputproperty="mem.size" os="FreeBSD" failifexecutionfails="false">
+      <arg value="-n"/>
+      <arg value="hw.physmem"/>
     </exec>
     <echo message="Mem size : ${mem.size}"/>
   </target>




--- conf/cassandra.yaml.orig	2021-07-01 14:37:50 UTC
+++ conf/cassandra.yaml
@@ -71,7 +71,7 @@ max_hints_delivery_threads: 2
 
 # Directory where Cassandra should store hints.
 # If not set, the default directory is $CASSANDRA_HOME/data/hints.

 
 # How often hints should be flushed from the internal buffers to disk.
 # Will *not* trigger fsync.
@@ -188,13 +188,13 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition
 # will spread data evenly across them, subject to the granularity of
 # the configured compaction strategy.
 # If not set, the default directory is $CASSANDRA_HOME/data/data.

 
 # Enable / disable CDC functionality on a per-node basis. This modifies the logic used
 # for write path allocation rejection (standard: never reject. cdc: reject Mutation
@@ -205,7 +205,7 @@ cdc_enabled: false
 # segment contains mutations for a CDC-enabled table. This should be placed on a
 # separate spindle than the data directories. If not set, the default directory is
 # $CASSANDRA_HOME/data/cdc_raw.

 
 # Policy for data disk failures:
 #
@@ -306,20 +306,12 @@ key_cache_save_period: 14400
 
 # Row cache implementation class name. Available implementations:
 #

 #
 # Default value is 0, to disable row caching.
 row_cache_size_in_mb: 0
@@ -366,7 +358,7 @@ counter_cache_save_period: 7200
 
 # saved caches
 # If not set, the default directory is $CASSANDRA_HOME/data/saved_caches.




--- doc/source/_templates/indexcontent.html.orig	2020-10-28 18:46:34 UTC
+++ doc/source/_templates/indexcontent.html
@@ -1,5 +1,12 @@
-{% extends "defindex.html" %}
-{% block tables %}
+{% extends "layout.html" %}
+{%- block htmltitle -%}
+<title>{{ html_title }}</title>
+{%- endblock -%}
+{% block body %}
+  <h1>{{ docstitle|e }}</h1>
+  <p>
+  {% trans %}Welcome! This is the documentation for Apache Cassandra {{ version }}.{% endtrans %}
+  </p>
 <div id="wipwarning">This documentation is currently a work-in-progress and contains a number of TODO sections.
     <a href="{{ pathto("bugs") }}">Contributions</a> are welcome.</div>
 

Lines 1-10 Link Here

(-)files/patch-doc_source___util_cql.py (-10 lines)
1	--- doc/source/_util/cql.py.orig 2020-10-28 18:48:05 UTC
2	+++ doc/source/_util/cql.py
3	@@ -26,7 +26,6 @@ from pygments.lexer import Lexer, RegexLexer, do_inser
4	from pygments.token import Punctuation, Whitespace, Error, \
5	Text, Comment, Operator, Keyword, Name, String, Number, Generic, Literal
6	from pygments.lexers import get_lexer_by_name, ClassNotFound
7	-from pygments.util import iteritems
8
9	__all__ = [ 'CQLLexer' ]
10

Lines 1-39 Link Here

(-)files/patch-pylib_cassandra-cqlsh-tests.sh (-11 / +26 lines)
1	--- pylib/cassandra-cqlsh-tests.sh.orig 2020-10-20 17:07:48 UTC	1	--- pylib/cassandra-cqlsh-tests.sh.orig 2022-01-03 17:11:14 UTC
2	+++ pylib/cassandra-cqlsh-tests.sh	2	+++ pylib/cassandra-cqlsh-tests.sh
3	@@ -1,4 +1,4 @@	3	@@ -1,4 +1,4 @@
4	-#!/bin/bash -x	4	-#!/bin/bash -x
5	+#!/usr/local/bin/bash -x	5	+#!/usr/local/bin/bash -x
		6	#
		7	# Licensed to the Apache Software Foundation (ASF) under one
		8	# or more contributor license agreements. See the NOTICE file
		9	@@ -15,7 +15,6 @@
		10	# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		11	# See the License for the specific language governing permissions and
		12	# limitations under the License.
		13	-#
6		14
7	################################	15	################################
8	#	16	#
9	@@ -9,6 +9,8 @@	17	@@ -24,9 +23,13 @@
		18	################################
		19
10	WORKSPACE=$1	20	WORKSPACE=$1
11	PYTHON_VERSION=$2	21	-PYTHON_VERSION=$2
12	JAVA_HOME=$3	22	-JAVA_HOME=$3
13	+REPO_DIR=$4	23	+JAVA_HOME=$2
14	+PYTHON_CMD=$5	24	+REPO_DIR=$3
		25	+PYTHON_CMD=$4
		26	+REPO_DIR=$5
15		27
		28	+PYTHON_VERSION=python3
		29	+
16	if [ "${WORKSPACE}" = "" ]; then	30	if [ "${WORKSPACE}" = "" ]; then
17	echo "Specify Cassandra source directory"	31	echo "Specify Cassandra source directory"
18	@@ -48,7 +50,7 @@ fi	32	exit
		33	@@ -65,7 +68,7 @@ fi
19		34
20	# Loop to prevent failure due to maven-ant-tasks not downloading a jar..	35	# Loop to prevent failure due to maven-ant-tasks not downloading a jar..
21	for x in $(seq 1 3); do	36	for x in $(seq 1 3); do
22	- ant -buildfile ${CASSANDRA_DIR}/build.xml realclean jar	37	- ant -buildfile ${CASSANDRA_DIR}/build.xml realclean jar
23	+ ant -buildfile ${CASSANDRA_DIR}/build.xml -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} -Dpycmd=${PYTHON_CMD} realclean jar	38	+ ${ANT_CMD} -buildfile ${CASSANDRA_DIR}/build.xml realclean jar -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR}
24	RETURN="$?"	39	RETURN="$?"
25	if [ "${RETURN}" -eq "0" ]; then	40	if [ "${RETURN}" -eq "0" ]; then
26	break	41	break
27	@@ -62,7 +64,7 @@ fi	42	@@ -79,7 +82,7 @@ fi
28		43
29	# Set up venv with dtest dependencies	44	# Set up venv with dtest dependencies
30	set -e # enable immediate exit if venv setup fails	45	set -e # enable immediate exit if venv setup fails
31	-virtualenv --python=$PYTHON_VERSION venv	46	-virtualenv --python=$PYTHON_VERSION venv
32	+virtualenv --python=${PYTHON_CMD} venv	47	+virtualenv --python=$PYTHON_CMD venv
33	source venv/bin/activate	48	source venv/bin/activate
34	pip install -r ${CASSANDRA_DIR}/pylib/requirements.txt	49	pip install -r ${CASSANDRA_DIR}/pylib/requirements.txt
35	pip freeze	50	pip freeze
36	@@ -103,7 +105,7 @@ case "${pre_or_post_cdc}" in	51	@@ -120,7 +123,7 @@ case "${pre_or_post_cdc}" in
37	;;	52	;;
38	esac	53	esac
39		54




--- pylib/requirements.txt.orig	2022-01-04 12:21:36 UTC
+++ pylib/requirements.txt
@@ -1,7 +1,6 @@
 # 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
-futures
 six>=0.12.0
 -e git+https://github.com/datastax/python-driver.git@cassandra-test#egg=cassandra-driver
 # Used ccm version is tracked by cassandra-test branch in ccm repo. Please create a PR there for fixes or upgrades to new releases.
@@ -17,4 +16,4 @@ nose-test-select
 parse
 pycodestyle
 psutil
-thrift==0.9.3
+thrift==0.10.0

Lines 1-6 Link Here

(-)files/patch-src_java_org_apache_cassandra_tools_nodetool_Status.java (-2 / +2 lines)
1	--- src/java/org/apache/cassandra/tools/nodetool/Status.java.orig 2019-12-18 11:47:59 UTC	1	--- src/java/org/apache/cassandra/tools/nodetool/Status.java.orig 2021-07-01 14:37:50 UTC
2	+++ src/java/org/apache/cassandra/tools/nodetool/Status.java	2	+++ src/java/org/apache/cassandra/tools/nodetool/Status.java
3	@@ -188,7 +188,7 @@ public class Status extends NodeToolCmd	3	@@ -190,7 +190,7 @@ public class Status extends NodeToolCmd
4	String addressPlaceholder = String.format("%%-%ds ", maxAddressLength);	4	String addressPlaceholder = String.format("%%-%ds ", maxAddressLength);
5	buf.append("%s%s "); // status	5	buf.append("%s%s "); // status
6	buf.append(addressPlaceholder); // address	6	buf.append(addressPlaceholder); // address




%%DATADIR%%/lib/asm-5.0.4.jar
%%DATADIR%%/lib/caffeine-2.2.6.jar
%%DATADIR%%/lib/cassandra-driver-core-3.0.1-shaded.jar
%%DATADIR%%/lib/cassandra-driver-internal-only-3.11.0-bb96859b.zip
%%DATADIR%%/lib/commons-cli-1.1.jar
%%DATADIR%%/lib/commons-codec-1.9.jar
%%DATADIR%%/lib/commons-lang3-3.1.jar

%%DATADIR%%/lib/disruptor-3.0.1.jar
%%DATADIR%%/lib/ecj-4.4.2.jar
%%DATADIR%%/lib/futures-2.1.6-py2.py3-none-any.zip
%%DATADIR%%/lib/geomet-0.1.0.zip
%%DATADIR%%/lib/guava-18.0.jar
%%DATADIR%%/lib/HdrHistogram-2.1.9.jar
%%DATADIR%%/lib/high-scale-lib-1.0.6.jar

%%DATADIR%%/lib/hppc-0.5.4.jar
%%DATADIR%%/lib/jackson-annotations-2.9.10.jar
%%DATADIR%%/lib/jackson-core-2.9.10.jar
%%DATADIR%%/lib/jackson-databind-2.9.10.8.jar
%%DATADIR%%/lib/jamm-0.3.0.jar
%%DATADIR%%/lib/javax.inject-1.jar
%%DATADIR%%/lib/jbcrypt-0.3m.jar
%%DATADIR%%/lib/jcl-over-slf4j-1.7.7.jar
%%DATADIR%%/lib/jctools-core-1.2.1.jar

%%DATADIR%%/lib/jna-4.2.2.jar
%%DATADIR%%/lib/joda-time-2.4.jar
%%DATADIR%%/lib/json-simple-1.1.jar
%%DATADIR%%/lib/jstackjunit-0.0.1.jar
%%DATADIR%%/lib/libthrift-0.9.2.jar
%%DATADIR%%/lib/licenses/airline-0.6.txt
%%DATADIR%%/lib/licenses/antlr-runtime-3.5.2.txt
%%DATADIR%%/lib/licenses/asm-5.0.4.txt
%%DATADIR%%/lib/licenses/caffeine-2.2.6.txt
%%DATADIR%%/lib/licenses/cassandra-driver-3.0.1.txt
%%DATADIR%%/lib/licenses/commons-cli-1.1.txt
%%DATADIR%%/lib/licenses/commons-codec-1.9.txt
%%DATADIR%%/lib/licenses/commons-lang3-3.1.txt
%%DATADIR%%/lib/licenses/commons-math3-3.2.txt
%%DATADIR%%/lib/licenses/compress-lzf-0.8.4.txt
%%DATADIR%%/lib/licenses/concurrent-trees-2.4.0.txt
%%DATADIR%%/lib/licenses/concurrentlinkedhashmap-lru-1.4.txt
%%DATADIR%%/lib/licenses/disruptor-3.0.1.txt
%%DATADIR%%/lib/licenses/ecj-4.4.2.txt
%%DATADIR%%/lib/licenses/futures-2.1.6.txt
%%DATADIR%%/lib/licenses/guava-18.0.txt
%%DATADIR%%/lib/licenses/hdrhistogram-2.1.9.txt
%%DATADIR%%/lib/licenses/high-scale-lib-1.0.6.txt
%%DATADIR%%/lib/licenses/hppc-0.5.4.txt
%%DATADIR%%/lib/licenses/jackson-core-asl-1.9.13.txt
%%DATADIR%%/lib/licenses/jackson-mapper-asl-1.9.13.txt
%%DATADIR%%/lib/licenses/jamm-0.3.0.txt
%%DATADIR%%/lib/licenses/javax.inject.txt
%%DATADIR%%/lib/licenses/jbcrypt-0.3m.txt
%%DATADIR%%/lib/licenses/jcl-over-slf4j-1.7.7.txt
%%DATADIR%%/lib/licenses/jctools-core-1.2.1.txt
%%DATADIR%%/lib/licenses/jflex-1.6.0.txt
%%DATADIR%%/lib/licenses/jna-4.2.2.txt
%%DATADIR%%/lib/licenses/joda-time-2.4.txt
%%DATADIR%%/lib/licenses/json-simple-1.1.txt
%%DATADIR%%/lib/licenses/jstackjunit-0.0.1.txt
%%DATADIR%%/lib/licenses/libthrift-0.9.2.txt
%%DATADIR%%/lib/licenses/log4j-over-slf4j-1.7.7.txt
%%DATADIR%%/lib/licenses/logback-classic-1.1.3.txt
%%DATADIR%%/lib/licenses/logback-core-1.1.3.txt
%%DATADIR%%/lib/licenses/lz4-1.3.0.txt
%%DATADIR%%/lib/licenses/metrics-core-3.1.5.txt
%%DATADIR%%/lib/licenses/metrics-jvm-3.1.5.txt
%%DATADIR%%/lib/licenses/metrics-logback-3.1.5.txt
%%DATADIR%%/lib/licenses/netty-all-4.0.44.Final.txt
%%DATADIR%%/lib/licenses/ohc-0.4.4.txt
%%DATADIR%%/lib/licenses/reporter-config-base-3.0.3.txt
%%DATADIR%%/lib/licenses/reporter-config3-3.0.3.txt
%%DATADIR%%/lib/licenses/six-1.7.3.txt
%%DATADIR%%/lib/licenses/slf4j-api-1.7.7.txt
%%DATADIR%%/lib/licenses/snakeyaml-1.11.txt
%%DATADIR%%/lib/licenses/snowball-stemmer-1.3.0.581.1.txt
%%DATADIR%%/lib/licenses/ST4-4.0.8.txt
%%DATADIR%%/lib/licenses/stream-2.5.2.txt
%%DATADIR%%/lib/licenses/thrift-server-0.3.7.txt
%%DATADIR%%/lib/log4j-over-slf4j-1.7.7.jar
%%DATADIR%%/lib/logback-classic-1.1.3.jar
%%DATADIR%%/lib/logback-core-1.1.3.jar

%%DATADIR%%/lib/ohc-core-j8-0.4.4.jar
%%DATADIR%%/lib/reporter-config-base-3.0.3.jar
%%DATADIR%%/lib/reporter-config3-3.0.3.jar
%%DATADIR%%/lib/six-1.16.0-py2.py3-none-any.zip
%%DATADIR%%/lib/slf4j-api-1.7.7.jar
%%DATADIR%%/lib/snakeyaml-1.11.jar
%%DATADIR%%/lib/snappy-java.jar

%%DATADIR%%/pylib/cqlshlib/test/ansi_colors.py
%%DATADIR%%/pylib/cqlshlib/test/basecase.py
%%DATADIR%%/pylib/cqlshlib/test/cassconnect.py
%%DATADIR%%/pylib/cqlshlib/test/config/sslhandling.config
%%DATADIR%%/pylib/cqlshlib/test/config/sslhandling_invalid.config
%%DATADIR%%/pylib/cqlshlib/test/run_cqlsh.py
%%DATADIR%%/pylib/cqlshlib/test/test_constants.py
%%DATADIR%%/pylib/cqlshlib/test/test_cql_parsing.py
%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_commands.py
%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.py

%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.py
%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_parsing.py
%%DATADIR%%/pylib/cqlshlib/test/test_keyspace_init.cql
%%DATADIR%%/pylib/cqlshlib/test/test_sslhandling.py
%%DATADIR%%/pylib/cqlshlib/test/winpty.py
%%DATADIR%%/pylib/cqlshlib/tracing.py
%%DATADIR%%/pylib/cqlshlib/util.py

Return to bug 261220

Line 0 Link Here

(-)files/patch-.build_build-resolver.xml (+27 lines)
	1	--- .build/build-resolver.xml.orig 2022-01-03 17:11:14 UTC
	2	+++ .build/build-resolver.xml
	3	@@ -182,7 +182,7 @@
	4
	5	<!-- files.pythonhosted.org -->
	6	<get src="https://files.pythonhosted.org/packages/59/a0/cf4cd997e1750f0c2d91c6ea5abea218251c43c3581bcc2f118b00baf5cf/futures-2.1.6-py2.py3-none-any.whl" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
	7	- <get src="https://files.pythonhosted.org/packages/2e/a4/6dcb84af409b7bc0c258a0d6bd7e14231724d9a46b750c048f09d74d870c/six-1.7.3-py2.py3-none-any.whl" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/six-1.7.3-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
	8	+ <get src="https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl" dest="${localm2}/org/apache/cassandra/deps/six-1.16.0-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
	9
	10	<!-- python-driver -->
	11	<get src="https://raw.githubusercontent.com/apache/cassandra/${lib.download.sha}/lib/cassandra-driver-internal-only-3.11.0-bb96859b.zip" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/cassandra-driver-internal-only-3.11.0-bb96859b.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
	12	@@ -216,7 +216,7 @@
	13	<copy todir="${build.lib}" quiet="true">
	14	<file file="${user.home}/.m2/repository/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip"/>
	15	<file file="${user.home}/.m2/repository/org/apache/cassandra/deps/cassandra-driver-internal-only-3.11.0-bb96859b.zip"/>
	16	- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/six-1.7.3-py2.py3-none-any.zip"/>
	17	+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/six-1.16.0-py2.py3-none-any.zip"/>
	18	</copy>
	19	<copy todir="${build.lib}/sigar-bin/" quiet="true">
	20	<file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-freebsd-6.so"/>
	21	@@ -243,4 +243,4 @@
	22	<file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/sigar-x86-winnt.lib"/>
	23	</copy>
	24	</target>
	25	-</project>
	26	\ No newline at end of file
	27	+</project>

Lines 1-14 Link Here

(-)files/patch-build.xml (-100 / +9 lines)
1	--- build.xml.orig 2020-10-20 17:07:48 UTC	1	--- build.xml.orig 2021-07-25 16:37:33 UTC
2	+++ build.xml	2	+++ build.xml
3	@@ -23,6 +23,7 @@	3	@@ -20,6 +20,8 @@
4	<property file="build.properties" />	4	<property file="build.properties" />
5	<property file="build.properties.default" />	5	<property file="build.properties.default" />
6	<property name="debuglevel" value="source,lines,vars"/>	6	<property name="debuglevel" value="source,lines,vars"/>
7	+ <property name="pycmd" value="python"/>	7	+ <property name="pycmd" value="python"/>
		8	+ <property name="rat.skip" value="true"/>
8		9
9	<!-- default version and SCM information -->	10	<!-- default version and SCM information -->
10	<property name="base.version" value="3.11.9"/>	11	<property name="base.version" value="3.11.11"/>
11	@@ -80,14 +81,14 @@	12	@@ -74,14 +76,14 @@
12	<condition property="version" value="${base.version}">	13	<condition property="version" value="${base.version}">
13	<isset property="release"/>	14	<isset property="release"/>
14	</condition>	15	</condition>
Lines 25-42 Link Here
25	<property name="maven-ant-tasks.url"	26	<property name="maven-ant-tasks.url"
26	value="https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks" />	27	value="https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks" />
27	<!-- details of how and which Maven repository we publish to -->	28	<!-- details of how and which Maven repository we publish to -->
28	@@ -247,8 +248,7 @@	29	@@ -253,6 +255,7 @@
29	<artifact:dependencies pathId="wikitext.classpath">	30	<target name="gen-doc" description="Generate documentation" depends="jar" unless="ant.gen-doc.skip">
30	<dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
31	<dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>
32	- <remoteRepository refid="central"/>
33	- <remoteRepository refid="apache"/>
34	+ <localRepository path="${localm2}"/>
35	</artifact:dependencies>
36	<taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
37	<wikitext-to-html markupLanguage="Textile">
38	@@ -261,6 +261,7 @@
39	<target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation">
40	<exec executable="make" osfamily="unix" dir="${doc.dir}">	31	<exec executable="make" osfamily="unix" dir="${doc.dir}">
41	<arg value="html"/>	32	<arg value="html"/>
42	+ <arg value="PYTHON_CMD=${pycmd}"/>	33	+ <arg value="PYTHON_CMD=${pycmd}"/>
Lines 43-98 Link Here
43	</exec>	34	</exec>
44	<exec executable="cmd" osfamily="dos" dir="${doc.dir}">	35	<exec executable="cmd" osfamily="dos" dir="${doc.dir}">
45	<arg value="/c"/>	36	<arg value="/c"/>
46	@@ -303,10 +304,6 @@	37	@@ -894,6 +897,88 @@
47	description="Initialize Maven ANT Tasks">
48	<typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
49
50	- <!-- define the remote repositories we use -->
51	- <artifact:remoteRepository id="central" url="${artifact.remoteRepository.central}"/>
52	- <artifact:remoteRepository id="apache" url="${artifact.remoteRepository.apache}"/>
53	-
54	<macrodef name="install">
55	<attribute name="pomFile"/>
56	<attribute name="file"/>
57	@@ -706,16 +703,14 @@
58	filesetId="build-dependency-jars"
59	cacheDependencyRefs="true"
60	dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">
61	- <remoteRepository refid="central"/>
62	- <remoteRepository refid="apache"/>
63	+ <localRepository path="${localm2}"/>
64	</artifact:dependencies>
65	<!-- retrieve -source.jar artifacts using the reference-pom with the artifacts that have these -->
66	<artifact:dependencies pomRefId="build-deps-pom-sources"
67	sourcesFilesetId="build-dependency-sources"
68	cacheDependencyRefs="true"
69	dependencyRefsBuildFile="${build.dir}/build-dependencies-sources.xml">
70	- <remoteRepository refid="central"/>
71	- <remoteRepository refid="apache"/>
72	+ <localRepository path="${localm2}"/>
73	</artifact:dependencies>
74	<copy todir="${build.dir.lib}/jars">
75	<fileset refid="build-dependency-jars"/>
76	@@ -728,7 +723,7 @@
77	<!-- code coverage tools -->
78	<artifact:dependencies pomRefId="coverage-deps-pom"
79	filesetId="coverage-dependency-jars">
80	- <remoteRepository refid="central"/>
81	+ <localRepository path="${localm2}"/>
82	</artifact:dependencies>
83	<copy todir="${build.dir.lib}/jars">
84	<fileset refid="coverage-dependency-jars"/>
85	@@ -749,8 +744,7 @@
86	sourcesFilesetId="test-dependency-sources"
87	cacheDependencyRefs="true"
88	dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">
89	- <remoteRepository refid="apache"/>
90	- <remoteRepository refid="central"/>
91	+ <localRepository path="${localm2}"/>
92	</artifact:dependencies>
93	<copy todir="${test.lib}/jars">
94	<fileset refid="test-dependency-jars"/>
95	@@ -1045,6 +1039,88 @@
96	</jar>	38	</jar>
97	</target>	39	</target>
98		40
Lines 179-216 Link Here
179	+ </target>	121	+ </target>
180	+	122	+
181	<!-- creates release tarballs -->	123	<!-- creates release tarballs -->
182	<target name="artifacts" depends="jar,javadoc,gen-doc"	124	<target name="artifacts" depends="jar,gen-doc,build-test,stress-build-test,sources-jar,javadoc-jar"
183	description="Create Cassandra release artifacts">	125	description="Create Cassandra release artifacts">
184	@@ -1644,8 +1720,7 @@
185	<target name="rat-init" depends="maven-ant-tasks-init">
186	<artifact:dependencies pathId="rat.classpath">
187	<dependency groupId="org.apache.rat" artifactId="apache-rat-tasks" version="0.6" />
188	- <remoteRepository refid="central"/>
189	- <remoteRepository refid="apache"/>
190	+ <localRepository path="${localm2}"/>
191	</artifact:dependencies>
192	<typedef uri="antlib:org.apache.rat.anttasks" classpathref="rat.classpath"/>
193	</target>
194	@@ -1794,8 +1869,8 @@
195	<exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
196	<arg value="--all"/>
197	</exec>
198	- <!-- support for Mac OS X -->
199	- <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
200	+ <!-- support for Mac OS X and FreeBSD -->
201	+ <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin,FreeBSD" failifexecutionfails="false">
202	<arg value="-n"/>
203	<arg value="hw.ncpu"/>
204	</exec>
205	@@ -1815,6 +1890,11 @@
206	<exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
207	<arg value="-n"/>
208	<arg value="hw.memsize"/>
209	+ </exec>
210	+ <!-- support for FreeBSD -->
211	+ <exec executable="sysctl" outputproperty="mem.size" os="FreeBSD" failifexecutionfails="false">
212	+ <arg value="-n"/>
213	+ <arg value="hw.physmem"/>
214	</exec>
215	<echo message="Mem size : ${mem.size}"/>
216	</target>

Lines 1-6 Link Here

(-)files/patch-conf_cassandra.yaml (-6 / +6 lines)
1	--- conf/cassandra.yaml.orig 2019-02-02 22:09:01 UTC	1	--- conf/cassandra.yaml.orig 2021-07-01 14:37:50 UTC
2	+++ conf/cassandra.yaml	2	+++ conf/cassandra.yaml
3	@@ -70,7 +70,7 @@ max_hints_delivery_threads: 2	3	@@ -71,7 +71,7 @@ max_hints_delivery_threads: 2
4		4
5	# Directory where Cassandra should store hints.	5	# Directory where Cassandra should store hints.
6	# If not set, the default directory is $CASSANDRA_HOME/data/hints.	6	# If not set, the default directory is $CASSANDRA_HOME/data/hints.
Lines 9-15 Link Here
9		9
10	# How often hints should be flushed from the internal buffers to disk.	10	# How often hints should be flushed from the internal buffers to disk.
11	# Will not trigger fsync.	11	# Will not trigger fsync.
12	@@ -187,13 +187,13 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition	12	@@ -188,13 +188,13 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition
13	# will spread data evenly across them, subject to the granularity of	13	# will spread data evenly across them, subject to the granularity of
14	# the configured compaction strategy.	14	# the configured compaction strategy.
15	# If not set, the default directory is $CASSANDRA_HOME/data/data.	15	# If not set, the default directory is $CASSANDRA_HOME/data/data.
Lines 26-32 Link Here
26		26
27	# Enable / disable CDC functionality on a per-node basis. This modifies the logic used	27	# Enable / disable CDC functionality on a per-node basis. This modifies the logic used
28	# for write path allocation rejection (standard: never reject. cdc: reject Mutation	28	# for write path allocation rejection (standard: never reject. cdc: reject Mutation
29	@@ -204,7 +204,7 @@ cdc_enabled: false	29	@@ -205,7 +205,7 @@ cdc_enabled: false
30	# segment contains mutations for a CDC-enabled table. This should be placed on a	30	# segment contains mutations for a CDC-enabled table. This should be placed on a
31	# separate spindle than the data directories. If not set, the default directory is	31	# separate spindle than the data directories. If not set, the default directory is
32	# $CASSANDRA_HOME/data/cdc_raw.	32	# $CASSANDRA_HOME/data/cdc_raw.
Lines 35-41 Link Here
35		35
36	# Policy for data disk failures:	36	# Policy for data disk failures:
37	#	37	#
38	@@ -305,20 +305,12 @@ key_cache_save_period: 14400	38	@@ -306,20 +306,12 @@ key_cache_save_period: 14400
39		39
40	# Row cache implementation class name. Available implementations:	40	# Row cache implementation class name. Available implementations:
41	#	41	#
Lines 57-63 Link Here
57	#	57	#
58	# Default value is 0, to disable row caching.	58	# Default value is 0, to disable row caching.
59	row_cache_size_in_mb: 0	59	row_cache_size_in_mb: 0
60	@@ -365,7 +357,7 @@ counter_cache_save_period: 7200	60	@@ -366,7 +358,7 @@ counter_cache_save_period: 7200
61		61
62	# saved caches	62	# saved caches
63	# If not set, the default directory is $CASSANDRA_HOME/data/saved_caches.	63	# If not set, the default directory is $CASSANDRA_HOME/data/saved_caches.

Lines 1-17 Link Here

(-)files/patch-doc_source___templates_indexcontent.html (-17 lines)
1	--- doc/source/_templates/indexcontent.html.orig 2020-10-28 18:46:34 UTC
2	+++ doc/source/_templates/indexcontent.html
3	@@ -1,5 +1,12 @@
4	-{% extends "defindex.html" %}
5	-{% block tables %}
6	+{% extends "layout.html" %}
7	+{%- block htmltitle -%}
8	+<title>{{ html_title }}</title>
9	+{%- endblock -%}
10	+{% block body %}
11	+ <h1>{{ docstitle\|e }}</h1>
12	+ <p>
13	+ {% trans %}Welcome! This is the documentation for Apache Cassandra {{ version }}.{% endtrans %}
14	+ </p>
15	<div id="wipwarning">This documentation is currently a work-in-progress and contains a number of TODO sections.
16	<a href="{{ pathto("bugs") }}">Contributions</a> are welcome.</div>
17

Line 0 Link Here

(-)files/patch-pylib_requirements.txt (+16 lines)
	1	--- pylib/requirements.txt.orig 2022-01-04 12:21:36 UTC
	2	+++ pylib/requirements.txt
	3	@@ -1,7 +1,6 @@
	4	# See python driver docs: futures and six have to be installed before
	5	# cythonizing the driver, perhaps only on old pips.
	6	# http://datastax.github.io/python-driver/installation.html#cython-based-extensions
	7	-futures
	8	six>=0.12.0
	9	-e git+https://github.com/datastax/python-driver.git@cassandra-test#egg=cassandra-driver
	10	# Used ccm version is tracked by cassandra-test branch in ccm repo. Please create a PR there for fixes or upgrades to new releases.
	11	@@ -17,4 +16,4 @@ nose-test-select
	12	parse
	13	pycodestyle
	14	psutil
	15	-thrift==0.9.3
	16	+thrift==0.10.0

Lines 19-25 Link Here

(-)pkg-plist (-56 / +8 lines)
19	%%DATADIR%%/lib/asm-5.0.4.jar	19	%%DATADIR%%/lib/asm-5.0.4.jar
20	%%DATADIR%%/lib/caffeine-2.2.6.jar	20	%%DATADIR%%/lib/caffeine-2.2.6.jar
21	%%DATADIR%%/lib/cassandra-driver-core-3.0.1-shaded.jar	21	%%DATADIR%%/lib/cassandra-driver-core-3.0.1-shaded.jar
22	%%DATADIR%%/lib/cassandra-driver-internal-only-3.23.0.post0-1a184b99.zip	22	%%DATADIR%%/lib/cassandra-driver-internal-only-3.11.0-bb96859b.zip
23	%%DATADIR%%/lib/commons-cli-1.1.jar	23	%%DATADIR%%/lib/commons-cli-1.1.jar
24	%%DATADIR%%/lib/commons-codec-1.9.jar	24	%%DATADIR%%/lib/commons-codec-1.9.jar
25	%%DATADIR%%/lib/commons-lang3-3.1.jar	25	%%DATADIR%%/lib/commons-lang3-3.1.jar
Lines 30-36 Link Here
30	%%DATADIR%%/lib/disruptor-3.0.1.jar	30	%%DATADIR%%/lib/disruptor-3.0.1.jar
31	%%DATADIR%%/lib/ecj-4.4.2.jar	31	%%DATADIR%%/lib/ecj-4.4.2.jar
32	%%DATADIR%%/lib/futures-2.1.6-py2.py3-none-any.zip	32	%%DATADIR%%/lib/futures-2.1.6-py2.py3-none-any.zip
33	%%DATADIR%%/lib/geomet-0.1.0.zip
34	%%DATADIR%%/lib/guava-18.0.jar	33	%%DATADIR%%/lib/guava-18.0.jar
35	%%DATADIR%%/lib/HdrHistogram-2.1.9.jar	34	%%DATADIR%%/lib/HdrHistogram-2.1.9.jar
36	%%DATADIR%%/lib/high-scale-lib-1.0.6.jar	35	%%DATADIR%%/lib/high-scale-lib-1.0.6.jar
Lines 37-45 Link Here
37	%%DATADIR%%/lib/hppc-0.5.4.jar	36	%%DATADIR%%/lib/hppc-0.5.4.jar
38	%%DATADIR%%/lib/jackson-annotations-2.9.10.jar	37	%%DATADIR%%/lib/jackson-annotations-2.9.10.jar
39	%%DATADIR%%/lib/jackson-core-2.9.10.jar	38	%%DATADIR%%/lib/jackson-core-2.9.10.jar
40	%%DATADIR%%/lib/jackson-databind-2.9.10.4.jar	39	%%DATADIR%%/lib/jackson-databind-2.9.10.8.jar
41	%%DATADIR%%/lib/jamm-0.3.0.jar	40	%%DATADIR%%/lib/jamm-0.3.0.jar
42	%%DATADIR%%/lib/javax.inject.jar	41	%%DATADIR%%/lib/javax.inject-1.jar
43	%%DATADIR%%/lib/jbcrypt-0.3m.jar	42	%%DATADIR%%/lib/jbcrypt-0.3m.jar
44	%%DATADIR%%/lib/jcl-over-slf4j-1.7.7.jar	43	%%DATADIR%%/lib/jcl-over-slf4j-1.7.7.jar
45	%%DATADIR%%/lib/jctools-core-1.2.1.jar	44	%%DATADIR%%/lib/jctools-core-1.2.1.jar
Lines 47-104 Link Here
47	%%DATADIR%%/lib/jna-4.2.2.jar	46	%%DATADIR%%/lib/jna-4.2.2.jar
48	%%DATADIR%%/lib/joda-time-2.4.jar	47	%%DATADIR%%/lib/joda-time-2.4.jar
49	%%DATADIR%%/lib/json-simple-1.1.jar	48	%%DATADIR%%/lib/json-simple-1.1.jar
50	%%DATADIR%%/lib/jstackjunit-0.0.1.jar
51	%%DATADIR%%/lib/libthrift-0.9.2.jar	49	%%DATADIR%%/lib/libthrift-0.9.2.jar
52	%%DATADIR%%/lib/licenses/airline-0.6.txt
53	%%DATADIR%%/lib/licenses/antlr-runtime-3.5.2.txt
54	%%DATADIR%%/lib/licenses/asm-5.0.4.txt
55	%%DATADIR%%/lib/licenses/caffeine-2.2.6.txt
56	%%DATADIR%%/lib/licenses/cassandra-driver-3.0.1.txt
57	%%DATADIR%%/lib/licenses/commons-cli-1.1.txt
58	%%DATADIR%%/lib/licenses/commons-codec-1.9.txt
59	%%DATADIR%%/lib/licenses/commons-lang3-3.1.txt
60	%%DATADIR%%/lib/licenses/commons-math3-3.2.txt
61	%%DATADIR%%/lib/licenses/compress-lzf-0.8.4.txt
62	%%DATADIR%%/lib/licenses/concurrent-trees-2.4.0.txt
63	%%DATADIR%%/lib/licenses/concurrentlinkedhashmap-lru-1.4.txt
64	%%DATADIR%%/lib/licenses/disruptor-3.0.1.txt
65	%%DATADIR%%/lib/licenses/ecj-4.4.2.txt
66	%%DATADIR%%/lib/licenses/futures-2.1.6.txt
67	%%DATADIR%%/lib/licenses/guava-18.0.txt
68	%%DATADIR%%/lib/licenses/hdrhistogram-2.1.9.txt
69	%%DATADIR%%/lib/licenses/high-scale-lib-1.0.6.txt
70	%%DATADIR%%/lib/licenses/hppc-0.5.4.txt
71	%%DATADIR%%/lib/licenses/jackson-core-asl-1.9.13.txt
72	%%DATADIR%%/lib/licenses/jackson-mapper-asl-1.9.13.txt
73	%%DATADIR%%/lib/licenses/jamm-0.3.0.txt
74	%%DATADIR%%/lib/licenses/javax.inject.txt
75	%%DATADIR%%/lib/licenses/jbcrypt-0.3m.txt
76	%%DATADIR%%/lib/licenses/jcl-over-slf4j-1.7.7.txt
77	%%DATADIR%%/lib/licenses/jctools-core-1.2.1.txt
78	%%DATADIR%%/lib/licenses/jflex-1.6.0.txt
79	%%DATADIR%%/lib/licenses/jna-4.2.2.txt
80	%%DATADIR%%/lib/licenses/joda-time-2.4.txt
81	%%DATADIR%%/lib/licenses/json-simple-1.1.txt
82	%%DATADIR%%/lib/licenses/jstackjunit-0.0.1.txt
83	%%DATADIR%%/lib/licenses/libthrift-0.9.2.txt
84	%%DATADIR%%/lib/licenses/log4j-over-slf4j-1.7.7.txt
85	%%DATADIR%%/lib/licenses/logback-classic-1.1.3.txt
86	%%DATADIR%%/lib/licenses/logback-core-1.1.3.txt
87	%%DATADIR%%/lib/licenses/lz4-1.3.0.txt
88	%%DATADIR%%/lib/licenses/metrics-core-3.1.5.txt
89	%%DATADIR%%/lib/licenses/metrics-jvm-3.1.5.txt
90	%%DATADIR%%/lib/licenses/metrics-logback-3.1.5.txt
91	%%DATADIR%%/lib/licenses/netty-all-4.0.44.Final.txt
92	%%DATADIR%%/lib/licenses/ohc-0.4.4.txt
93	%%DATADIR%%/lib/licenses/reporter-config-base-3.0.3.txt
94	%%DATADIR%%/lib/licenses/reporter-config3-3.0.3.txt
95	%%DATADIR%%/lib/licenses/six-1.7.3.txt
96	%%DATADIR%%/lib/licenses/slf4j-api-1.7.7.txt
97	%%DATADIR%%/lib/licenses/snakeyaml-1.11.txt
98	%%DATADIR%%/lib/licenses/snowball-stemmer-1.3.0.581.1.txt
99	%%DATADIR%%/lib/licenses/ST4-4.0.8.txt
100	%%DATADIR%%/lib/licenses/stream-2.5.2.txt
101	%%DATADIR%%/lib/licenses/thrift-server-0.3.7.txt
102	%%DATADIR%%/lib/log4j-over-slf4j-1.7.7.jar	50	%%DATADIR%%/lib/log4j-over-slf4j-1.7.7.jar
103	%%DATADIR%%/lib/logback-classic-1.1.3.jar	51	%%DATADIR%%/lib/logback-classic-1.1.3.jar
104	%%DATADIR%%/lib/logback-core-1.1.3.jar	52	%%DATADIR%%/lib/logback-core-1.1.3.jar
Lines 111-117 Link Here
111	%%DATADIR%%/lib/ohc-core-j8-0.4.4.jar	59	%%DATADIR%%/lib/ohc-core-j8-0.4.4.jar
112	%%DATADIR%%/lib/reporter-config-base-3.0.3.jar	60	%%DATADIR%%/lib/reporter-config-base-3.0.3.jar
113	%%DATADIR%%/lib/reporter-config3-3.0.3.jar	61	%%DATADIR%%/lib/reporter-config3-3.0.3.jar
114	%%DATADIR%%/lib/six-1.12.0-py2.py3-none-any.zip	62	%%DATADIR%%/lib/six-1.16.0-py2.py3-none-any.zip
115	%%DATADIR%%/lib/slf4j-api-1.7.7.jar	63	%%DATADIR%%/lib/slf4j-api-1.7.7.jar
116	%%DATADIR%%/lib/snakeyaml-1.11.jar	64	%%DATADIR%%/lib/snakeyaml-1.11.jar
117	%%DATADIR%%/lib/snappy-java.jar	65	%%DATADIR%%/lib/snappy-java.jar
Lines 139-145 Link Here
139	%%DATADIR%%/pylib/cqlshlib/test/ansi_colors.py	87	%%DATADIR%%/pylib/cqlshlib/test/ansi_colors.py
140	%%DATADIR%%/pylib/cqlshlib/test/basecase.py	88	%%DATADIR%%/pylib/cqlshlib/test/basecase.py
141	%%DATADIR%%/pylib/cqlshlib/test/cassconnect.py	89	%%DATADIR%%/pylib/cqlshlib/test/cassconnect.py
		90	%%DATADIR%%/pylib/cqlshlib/test/config/sslhandling.config
		91	%%DATADIR%%/pylib/cqlshlib/test/config/sslhandling_invalid.config
142	%%DATADIR%%/pylib/cqlshlib/test/run_cqlsh.py	92	%%DATADIR%%/pylib/cqlshlib/test/run_cqlsh.py
		93	%%DATADIR%%/pylib/cqlshlib/test/test_constants.py
143	%%DATADIR%%/pylib/cqlshlib/test/test_cql_parsing.py	94	%%DATADIR%%/pylib/cqlshlib/test/test_cql_parsing.py
144	%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_commands.py	95	%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_commands.py
145	%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.py	96	%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.py
Lines 147-152 Link Here
147	%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.py	98	%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.py
148	%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_parsing.py	99	%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_parsing.py
149	%%DATADIR%%/pylib/cqlshlib/test/test_keyspace_init.cql	100	%%DATADIR%%/pylib/cqlshlib/test/test_keyspace_init.cql
		101	%%DATADIR%%/pylib/cqlshlib/test/test_sslhandling.py
150	%%DATADIR%%/pylib/cqlshlib/test/winpty.py	102	%%DATADIR%%/pylib/cqlshlib/test/winpty.py
151	%%DATADIR%%/pylib/cqlshlib/tracing.py	103	%%DATADIR%%/pylib/cqlshlib/tracing.py
152	%%DATADIR%%/pylib/cqlshlib/util.py	104	%%DATADIR%%/pylib/cqlshlib/util.py