Attachment #231642 for bug #261220

Lines 27-33 USE_RC_SUBR= cassandra Link Here

(-)b/databases/cassandra3/Makefile (-1 / +1 lines)
27		27
28	USE_GITHUB= yes	28	USE_GITHUB= yes
29	GH_ACCOUNT= polo-language	29	GH_ACCOUNT= polo-language
30	GH_TAGNAME= 84496b0	30	GH_TAGNAME= 0150ddc
31		31
32	TEST_TARGET= test	32	TEST_TARGET= test
33		33

Lines 1-5 Link Here

(-)b/databases/cassandra3/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1642239227	1	TIMESTAMP = 1644320773
2	SHA256 (apache-cassandra-3.11.11-repo.tar.gz) = 585ae7ce7bc1e2edc534c5c36f982c6e712d5e9716e1c6376638a16306f30d7d	2	SHA256 (apache-cassandra-3.11.11-repo.tar.gz) = 0501ab9fa4d5baecaa29153a78044ef2341feda5ab748b8adb72a6efda2a240b
3	SIZE (apache-cassandra-3.11.11-repo.tar.gz) = 55148770	3	SIZE (apache-cassandra-3.11.11-repo.tar.gz) = 57546653
4	SHA256 (polo-language-cassandra-3.11.11-84496b0_GH0.tar.gz) = 4271a3336cfd745674f8bf3ca7ebd4b5cf9be2570aa1e69821d2cb370e018f07	4	SHA256 (polo-language-cassandra-3.11.11-0150ddc_GH0.tar.gz) = ff3e305bbe317af11674862487753875bb9f26e7550cb796cb995e640a2a9511
5	SIZE (polo-language-cassandra-3.11.11-84496b0_GH0.tar.gz) = 12786216	5	SIZE (polo-language-cassandra-3.11.11-0150ddc_GH0.tar.gz) = 12427444




--- .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>

Lines 1-4 Link Here

(-)b/databases/cassandra3/files/patch-build.xml (-1 / +10 lines)
1	--- build.xml.orig 2021-07-25 16:37:33 UTC	1	--- build.xml.orig 2022-01-15 09:03:19 UTC
2	+++ build.xml	2	+++ build.xml
3	@@ -20,6 +20,8 @@	3	@@ -20,6 +20,8 @@
4	<property file="build.properties" />	4	<property file="build.properties" />
Lines 34-39 Link Here
34	</exec>	34	</exec>
35	<exec executable="cmd" osfamily="dos" dir="${doc.dir}">	35	<exec executable="cmd" osfamily="dos" dir="${doc.dir}">
36	<arg value="/c"/>	36	<arg value="/c"/>
		37	@@ -704,7 +707,7 @@
		38	<target name="build" depends="resolver-retrieve-build,build-project" description="Compile Cassandra classes"/>
		39	<target name="codecoverage" depends="jacoco-run,jacoco-report" description="Create code coverage report"/>
		40
		41	- <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java,rat-check"
		42	+ <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java"
		43	name="build-project">
		44	<echo message="${ant.project.name}: ${ant.file}"/>
		45	<!-- Order matters! -->
37	@@ -894,6 +897,88 @@	46	@@ -894,6 +897,88 @@
38	</jar>	47	</jar>
39	</target>	48	</target>

Lines 30-35 Link Here

(-)b/databases/cassandra3/pkg-plist (-1 / +1 lines)
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
33	%%DATADIR%%/lib/guava-18.0.jar	34	%%DATADIR%%/lib/guava-18.0.jar
34	%%DATADIR%%/lib/HdrHistogram-2.1.9.jar	35	%%DATADIR%%/lib/HdrHistogram-2.1.9.jar
35	%%DATADIR%%/lib/high-scale-lib-1.0.6.jar	36	%%DATADIR%%/lib/high-scale-lib-1.0.6.jar
36	-

Return to bug 261220

Removed Link Here

(-)a/databases/cassandra3/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>