svn commit: r553918 - in head/databases/cassandra4: . files
Mikael Urankar
mikael at FreeBSD.org
Mon Nov 2 17:40:44 UTC 2020
Author: mikael
Date: Mon Nov 2 17:40:42 2020
New Revision: 553918
URL: https://svnweb.freebsd.org/changeset/ports/553918
Log:
databases/cassandra4: Update to version 4.0-beta2.
PR: 250167
Submitted by: Angelo Polo (maintainer)
Added:
head/databases/cassandra4/files/patch-doc_source___templates_indexcontent.html (contents, props changed)
head/databases/cassandra4/files/patch-doc_source___util_cql.py (contents, props changed)
Deleted:
head/databases/cassandra4/files/patch-doc_gen-nodetool-docs.py
Modified:
head/databases/cassandra4/Makefile
head/databases/cassandra4/distinfo
head/databases/cassandra4/files/patch-build.xml
head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java
head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java
head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_NativeLibrary.java
head/databases/cassandra4/pkg-descr
head/databases/cassandra4/pkg-plist
Modified: head/databases/cassandra4/Makefile
==============================================================================
--- head/databases/cassandra4/Makefile Mon Nov 2 17:24:08 2020 (r553917)
+++ head/databases/cassandra4/Makefile Mon Nov 2 17:40:42 2020 (r553918)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cassandra
-DISTVERSION= 4.0-beta1
+DISTVERSION= 4.0-beta2
CATEGORIES= databases java
MASTER_SITES= APACHE/cassandra/${DISTVERSION}:apache \
https://repo1.maven.org/maven2/com/github/luben/zstd-jni/1.4.5-4/:maven \
Modified: head/databases/cassandra4/distinfo
==============================================================================
--- head/databases/cassandra4/distinfo Mon Nov 2 17:24:08 2020 (r553917)
+++ head/databases/cassandra4/distinfo Mon Nov 2 17:40:42 2020 (r553918)
@@ -1,9 +1,9 @@
-TIMESTAMP = 1595420655
-SHA256 (apache-cassandra-4.0-beta1-src.tar.gz) = 341bcd561e68c569ba1083d7595476a09c10ac491df0051e7b5e4cc99590a865
-SIZE (apache-cassandra-4.0-beta1-src.tar.gz) = 46454540
+TIMESTAMP = 1601573969
+SHA256 (apache-cassandra-4.0-beta2-src.tar.gz) = 02347ce3d55fd7d68f90c112ee01d82902dfd959cf03c107a51d15bcaabb48c5
+SIZE (apache-cassandra-4.0-beta2-src.tar.gz) = 46741277
SHA256 (zstd-jni-1.4.5-4-freebsd_amd64.jar) = cdfcacd3d0b405869fc71c7c73ff861fa5421045f53a6168a0d0b4e8ae7ebfbc
SIZE (zstd-jni-1.4.5-4-freebsd_amd64.jar) = 512671
SHA256 (zstd-jni-1.4.5-4-freebsd_i386.jar) = bb3e6e4081ffbe28648983d3c2f47cd488a29b6bb09b1e9f1219cdf82b3ed648
SIZE (zstd-jni-1.4.5-4-freebsd_i386.jar) = 418462
-SHA256 (apache-cassandra-4.0-beta1-repo.tar.gz) = ef9efcff62f4ea567eed01e4f70185068a11f9cb766129ccce0f0f86d45506b1
-SIZE (apache-cassandra-4.0-beta1-repo.tar.gz) = 77747125
+SHA256 (apache-cassandra-4.0-beta2-repo.tar.gz) = 9a0d3ad05f535158dd65761a16f3a9fb0362cbe365d6e08ef6d9896bbf3a022f
+SIZE (apache-cassandra-4.0-beta2-repo.tar.gz) = 77730955
Modified: head/databases/cassandra4/files/patch-build.xml
==============================================================================
--- head/databases/cassandra4/files/patch-build.xml Mon Nov 2 17:24:08 2020 (r553917)
+++ head/databases/cassandra4/files/patch-build.xml Mon Nov 2 17:40:42 2020 (r553918)
@@ -1,4 +1,4 @@
---- build.xml.orig 2020-07-17 21:24:30 UTC
+--- build.xml.orig 2020-08-28 13:55:55 UTC
+++ build.xml
@@ -23,6 +23,7 @@
<property file="build.properties" />
@@ -7,7 +7,7 @@
+ <property name="pycmd" value="python"/>
<!-- default version and SCM information -->
- <property name="base.version" value="4.0-beta1"/>
+ <property name="base.version" value="4.0-beta2"/>
@@ -74,14 +75,14 @@
<condition property="version" value="${base.version}">
<isset property="release"/>
@@ -25,7 +25,7 @@
<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 -->
-@@ -246,7 +247,7 @@
+@@ -271,7 +272,7 @@
</path>
<path id="cassandra.classpath.test">
<file file="${build.dir}/${final.name}.jar"/> <!-- we need the jar for tests and benchmarks (multi-version jar) -->
@@ -34,7 +34,7 @@
<include name="**/*.jar" />
<exclude name="**/*-sources.jar"/>
<exclude name="**/ant-*.jar"/>
-@@ -391,8 +392,7 @@
+@@ -416,8 +417,7 @@
<artifact:dependencies pathId="wikitext.classpath">
<dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
<dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>
@@ -44,7 +44,7 @@
</artifact:dependencies>
<taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
<wikitext-to-html markupLanguage="Textile">
-@@ -405,6 +405,8 @@
+@@ -430,6 +430,8 @@
<target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation" unless="ant.gen-doc.skip">
<exec executable="make" osfamily="unix" dir="${doc.dir}">
<arg value="html"/>
@@ -53,7 +53,7 @@
</exec>
<exec executable="cmd" osfamily="dos" dir="${doc.dir}">
<arg value="/c"/>
-@@ -447,10 +449,6 @@
+@@ -472,10 +474,6 @@
description="Initialize Maven ANT Tasks">
<typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
@@ -64,7 +64,7 @@
<macrodef name="install">
<attribute name="pomFile"/>
<attribute name="file"/>
-@@ -865,16 +863,14 @@
+@@ -889,16 +887,14 @@
filesetId="build-dependency-jars"
cacheDependencyRefs="true"
dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">
@@ -83,7 +83,7 @@
</artifact:dependencies>
<copy todir="${build.dir.lib}/jars">
<fileset refid="build-dependency-jars"/>
-@@ -887,7 +883,7 @@
+@@ -911,7 +907,7 @@
<!-- code coverage tools -->
<artifact:dependencies pomRefId="coverage-deps-pom"
filesetId="coverage-dependency-jars">
@@ -92,7 +92,7 @@
</artifact:dependencies>
<copy todir="${build.dir.lib}/jars">
<fileset refid="coverage-dependency-jars"/>
-@@ -916,8 +912,7 @@
+@@ -940,8 +936,7 @@
sourcesFilesetId="test-dependency-sources"
cacheDependencyRefs="true"
dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">
@@ -102,7 +102,7 @@
</artifact:dependencies>
<copy todir="${test.lib}/jars">
<fileset refid="test-dependency-jars"/>
-@@ -1227,6 +1222,87 @@
+@@ -1251,6 +1246,87 @@
</copy>
</target>
@@ -190,7 +190,7 @@
<!-- creates release tarballs -->
<target name="artifacts" depends="_artifacts-init"
description="Create Cassandra release artifacts">
-@@ -1347,6 +1423,7 @@
+@@ -1371,6 +1447,7 @@
<target name="_build-test">
<javac
fork="true"
@@ -198,7 +198,7 @@
compiler="modern"
debug="true"
debuglevel="${debuglevel}"
-@@ -1938,8 +2015,8 @@
+@@ -1960,8 +2037,8 @@
<exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
<arg value="--all"/>
</exec>
@@ -209,7 +209,7 @@
<arg value="-n"/>
<arg value="hw.ncpu"/>
</exec>
-@@ -1959,6 +2036,11 @@
+@@ -1981,6 +2058,11 @@
<exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
<arg value="-n"/>
<arg value="hw.memsize"/>
Added: head/databases/cassandra4/files/patch-doc_source___templates_indexcontent.html
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/cassandra4/files/patch-doc_source___templates_indexcontent.html Mon Nov 2 17:40:42 2020 (r553918)
@@ -0,0 +1,17 @@
+--- doc/source/_templates/indexcontent.html.orig 2020-08-28 13:55:55 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 a work-in-progress.
+ <a href="{{ pathto("bugs") }}">Contributions</a> are welcome.</div>
+
Added: head/databases/cassandra4/files/patch-doc_source___util_cql.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/cassandra4/files/patch-doc_source___util_cql.py Mon Nov 2 17:40:42 2020 (r553918)
@@ -0,0 +1,10 @@
+--- doc/source/_util/cql.py.orig 2020-10-03 15:05:17 UTC
++++ doc/source/_util/cql.py
+@@ -26,7 +26,6 @@ from pygments.lexer import Lexer, RegexLexer, do_inser
+ from pygments.token import Punctuation, Whitespace, Error, \
+ Text, Comment, Operator, Keyword, Name, String, Number, Generic, Literal
+ from pygments.lexers import get_lexer_by_name, ClassNotFound
+-from pygments.util import iteritems
+
+ __all__ = [ 'CQLLexer' ]
+
Modified: head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java
==============================================================================
--- head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java Mon Nov 2 17:24:08 2020 (r553917)
+++ head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java Mon Nov 2 17:40:42 2020 (r553918)
@@ -1,6 +1,6 @@
---- src/java/org/apache/cassandra/config/Config.java.orig 2020-01-30 17:34:32 UTC
+--- src/java/org/apache/cassandra/config/Config.java.orig 2020-08-28 13:55:55 UTC
+++ src/java/org/apache/cassandra/config/Config.java
-@@ -289,7 +289,7 @@ public class Config
+@@ -290,7 +290,7 @@ public class Config
public volatile int key_cache_save_period = 14400;
public volatile int key_cache_keys_to_save = Integer.MAX_VALUE;
Modified: head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java
==============================================================================
--- head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java Mon Nov 2 17:24:08 2020 (r553917)
+++ head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java Mon Nov 2 17:40:42 2020 (r553918)
@@ -1,6 +1,6 @@
---- src/java/org/apache/cassandra/service/StartupChecks.java.orig 2020-07-17 21:24:30 UTC
+--- src/java/org/apache/cassandra/service/StartupChecks.java.orig 2020-08-28 13:55:56 UTC
+++ src/java/org/apache/cassandra/service/StartupChecks.java
-@@ -276,7 +276,14 @@ public class StartupChecks
+@@ -281,7 +281,14 @@ public class StartupChecks
{
public void execute()
{
Modified: head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_NativeLibrary.java
==============================================================================
--- head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_NativeLibrary.java Mon Nov 2 17:24:08 2020 (r553917)
+++ head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_NativeLibrary.java Mon Nov 2 17:40:42 2020 (r553918)
@@ -1,6 +1,6 @@
---- src/java/org/apache/cassandra/utils/NativeLibrary.java.orig 2020-01-30 17:34:32 UTC
+--- src/java/org/apache/cassandra/utils/NativeLibrary.java.orig 2020-08-28 13:55:56 UTC
+++ src/java/org/apache/cassandra/utils/NativeLibrary.java
-@@ -141,7 +141,10 @@ public final class NativeLibrary
+@@ -143,7 +143,10 @@ public final class NativeLibrary
else if (osName.contains("windows"))
return WINDOWS;
Modified: head/databases/cassandra4/pkg-descr
==============================================================================
--- head/databases/cassandra4/pkg-descr Mon Nov 2 17:24:08 2020 (r553917)
+++ head/databases/cassandra4/pkg-descr Mon Nov 2 17:40:42 2020 (r553918)
@@ -11,6 +11,6 @@ Apache project.
The CQL query language offers SQL-like data access and management.
Drivers are available for a number of languages.
-This is an ALPHA version! It is not intended for production use.
+This is a BETA version!
WWW: https://cassandra.apache.org/
Modified: head/databases/cassandra4/pkg-plist
==============================================================================
--- head/databases/cassandra4/pkg-plist Mon Nov 2 17:24:08 2020 (r553917)
+++ head/databases/cassandra4/pkg-plist Mon Nov 2 17:40:42 2020 (r553918)
@@ -25,7 +25,7 @@
%%DATADIR%%/lib/chronicle-wire-1.16.1.jar
%%DATADIR%%/lib/commons-cli-1.1.jar
%%DATADIR%%/lib/commons-codec-1.9.jar
-%%DATADIR%%/lib/commons-lang3-3.1.jar
+%%DATADIR%%/lib/commons-lang3-3.11.jar
%%DATADIR%%/lib/commons-math3-3.2.jar
%%DATADIR%%/lib/concurrent-trees-2.4.0.jar
%%DATADIR%%/lib/ecj-4.6.1.jar
More information about the svn-ports-head
mailing list