Date: Wed, 18 Dec 2019 02:27:36 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520356 - in head/databases/cassandra3: . files Message-ID: <201912180227.xBI2RaZs019412@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Wed Dec 18 02:27:35 2019 New Revision: 520356 URL: https://svnweb.freebsd.org/changeset/ports/520356 Log: databases/cassandra3: Update 3.11.4 -> 3.11.5 PR: 242692 Submitted by: language.devel@gmail.com (maintainer) Modified: head/databases/cassandra3/Makefile head/databases/cassandra3/distinfo head/databases/cassandra3/files/patch-bin_cassandra head/databases/cassandra3/files/patch-build.xml head/databases/cassandra3/files/patch-src_java_org_apache_cassandra_config_Config.java Modified: head/databases/cassandra3/Makefile ============================================================================== --- head/databases/cassandra3/Makefile Wed Dec 18 01:46:22 2019 (r520355) +++ head/databases/cassandra3/Makefile Wed Dec 18 02:27:35 2019 (r520356) @@ -1,15 +1,14 @@ # $FreeBSD$ PORTNAME= cassandra -DISTVERSION= 3.11.4 -PORTREVISION= 1 +DISTVERSION= 3.11.5 CATEGORIES= databases java MASTER_SITES= APACHE/cassandra/${PORTVERSION}:apache \ LOCAL/yuri:repo PKGNAMESUFFIX= 3 DISTNAME= apache-${PORTNAME}-${PORTVERSION}-src DISTFILES= ${DISTNAME}.tar.gz:apache \ - apache-${PORTNAME}-${PORTVERSION}-repo.tar.gz:repo + apache-${PORTNAME}-3.11.4-repo.tar.gz:repo MAINTAINER= language.devel@gmail.com COMMENT= Highly scalable distributed database Modified: head/databases/cassandra3/distinfo ============================================================================== --- head/databases/cassandra3/distinfo Wed Dec 18 01:46:22 2019 (r520355) +++ head/databases/cassandra3/distinfo Wed Dec 18 02:27:35 2019 (r520356) @@ -1,5 +1,5 @@ -TIMESTAMP = 1551608918 -SHA256 (apache-cassandra-3.11.4-src.tar.gz) = b01fea1b0a987adcc6078eef1f7e7fc43aacc3b4b0bfa3f29bc8a1cc9ba02cc6 -SIZE (apache-cassandra-3.11.4-src.tar.gz) = 39719274 +TIMESTAMP = 1576515047 +SHA256 (apache-cassandra-3.11.5-src.tar.gz) = d5363386b6ddbee59cf7dbbb2564a5f23ca236e728eebce12daf83b5ccdd50d8 +SIZE (apache-cassandra-3.11.5-src.tar.gz) = 39798994 SHA256 (apache-cassandra-3.11.4-repo.tar.gz) = e0ae04f002295b7477e1d73b76c8dab2301d015b273bc086ad7482178dfaed44 SIZE (apache-cassandra-3.11.4-repo.tar.gz) = 44524889 Modified: head/databases/cassandra3/files/patch-bin_cassandra ============================================================================== --- head/databases/cassandra3/files/patch-bin_cassandra Wed Dec 18 01:46:22 2019 (r520355) +++ head/databases/cassandra3/files/patch-bin_cassandra Wed Dec 18 02:27:35 2019 (r520356) @@ -1,11 +1,20 @@ ---- bin/cassandra.orig 2018-09-07 13:43:49 UTC +--- bin/cassandra.orig 2019-12-13 12:50:29 UTC +++ bin/cassandra -@@ -189,7 +189,7 @@ launch_service() - props="$3" - class="$4" - cassandra_parms="-Dlogback.configurationFile=logback.xml" -- cassandra_parms="$cassandra_parms -Dcassandra.logdir=$CASSANDRA_HOME/logs" -+ cassandra_parms="$cassandra_parms -Dcassandra.logdir=/var/log/cassandra" - cassandra_parms="$cassandra_parms -Dcassandra.storagedir=$cassandra_storagedir" +@@ -30,7 +30,7 @@ + # JVM_OPTS -- Additional arguments to the JVM for heap size, etc + # JVM_ON_OUT_OF_MEMORY_ERROR_OPT -- The OnOutOfMemoryError JVM option if specified + # CASSANDRA_CONF -- Directory containing Cassandra configuration files. +-# CASSANDRA_LOG_DIR -- Directory containing logs(default: $CASSANDRA_HOME/logs). ++# CASSANDRA_LOG_DIR -- Directory containing logs(default: /var/log/cassandra). + # + # As a convenience, a fragment of shell is sourced in order to set one or + # more of these variables. This so-called `include' can be placed in a +@@ -127,7 +127,7 @@ if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then + fi - if [ "x$pidpath" != "x" ]; then + if [ -z "$CASSANDRA_LOG_DIR" ]; then +- CASSANDRA_LOG_DIR=$CASSANDRA_HOME/logs ++ CASSANDRA_LOG_DIR=/var/log/cassandra + fi + + # Special-case path variables. Modified: head/databases/cassandra3/files/patch-build.xml ============================================================================== --- head/databases/cassandra3/files/patch-build.xml Wed Dec 18 01:46:22 2019 (r520355) +++ head/databases/cassandra3/files/patch-build.xml Wed Dec 18 02:27:35 2019 (r520356) @@ -1,4 +1,4 @@ ---- build.xml.orig 2019-02-02 22:06:43 UTC +--- build.xml.orig 2019-10-24 16:42:10 UTC +++ build.xml @@ -23,6 +23,7 @@ <property file="build.properties" /> @@ -7,8 +7,8 @@ + <property name="pycmd" value="python"/> <!-- default version and SCM information --> - <property name="base.version" value="3.11.4"/> -@@ -77,14 +78,14 @@ + <property name="base.version" value="3.11.5"/> +@@ -78,14 +79,14 @@ <condition property="version" value="${base.version}"> <isset property="release"/> </condition> @@ -23,9 +23,9 @@ - <property name="maven-ant-tasks.local" value="${user.home}/.m2/repository/org/apache/maven/maven-ant-tasks"/> + <property name="maven-ant-tasks.local" value="${localm2}/org/apache/maven/maven-ant-tasks"/> <property name="maven-ant-tasks.url" - value="http://repo2.maven.org/maven2/org/apache/maven/maven-ant-tasks" /> + value="https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks" /> <!-- details of how and which Maven repository we publish to --> -@@ -247,8 +248,7 @@ +@@ -244,8 +245,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"/> @@ -35,7 +35,7 @@ </artifact:dependencies> <taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" /> <wikitext-to-html markupLanguage="Textile"> -@@ -261,6 +261,7 @@ +@@ -258,6 +258,7 @@ <target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation"> <exec executable="make" osfamily="unix" dir="${doc.dir}"> <arg value="html"/> @@ -43,7 +43,7 @@ </exec> <exec executable="cmd" osfamily="dos" dir="${doc.dir}"> <arg value="/c"/> -@@ -303,10 +304,6 @@ +@@ -300,10 +301,6 @@ description="Initialize Maven ANT Tasks"> <typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" /> @@ -54,7 +54,7 @@ <macrodef name="install"> <attribute name="pomFile"/> <attribute name="file"/> -@@ -685,16 +682,14 @@ +@@ -682,16 +679,14 @@ filesetId="build-dependency-jars" cacheDependencyRefs="true" dependencyRefsBuildFile="${build.dir}/build-dependencies.xml"> @@ -73,7 +73,7 @@ </artifact:dependencies> <copy todir="${build.dir.lib}/jars"> <fileset refid="build-dependency-jars"/> -@@ -707,7 +702,7 @@ +@@ -704,7 +699,7 @@ <!-- code coverage tools --> <artifact:dependencies pomRefId="coverage-deps-pom" filesetId="coverage-dependency-jars"> @@ -82,7 +82,7 @@ </artifact:dependencies> <copy todir="${build.dir.lib}/jars"> <fileset refid="coverage-dependency-jars"/> -@@ -728,8 +723,7 @@ +@@ -725,8 +720,7 @@ sourcesFilesetId="test-dependency-sources" cacheDependencyRefs="true" dependencyRefsBuildFile="${build.dir}/test-dependencies.xml"> @@ -92,7 +92,7 @@ </artifact:dependencies> <copy todir="${test.lib}/jars"> <fileset refid="test-dependency-jars"/> -@@ -1024,6 +1018,88 @@ +@@ -1021,6 +1015,88 @@ </jar> </target> @@ -181,7 +181,7 @@ <!-- creates release tarballs --> <target name="artifacts" depends="jar,javadoc,gen-doc" description="Create Cassandra release artifacts"> -@@ -1767,8 +1843,8 @@ +@@ -1771,8 +1847,8 @@ <exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false"> <arg value="--all"/> </exec> @@ -192,7 +192,7 @@ <arg value="-n"/> <arg value="hw.ncpu"/> </exec> -@@ -1788,6 +1864,11 @@ +@@ -1792,6 +1868,11 @@ <exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false"> <arg value="-n"/> <arg value="hw.memsize"/> Modified: head/databases/cassandra3/files/patch-src_java_org_apache_cassandra_config_Config.java ============================================================================== --- head/databases/cassandra3/files/patch-src_java_org_apache_cassandra_config_Config.java Wed Dec 18 01:46:22 2019 (r520355) +++ head/databases/cassandra3/files/patch-src_java_org_apache_cassandra_config_Config.java Wed Dec 18 02:27:35 2019 (r520356) @@ -1,6 +1,6 @@ ---- src/java/org/apache/cassandra/config/Config.java.orig 2018-03-06 21:16:18 UTC +--- src/java/org/apache/cassandra/config/Config.java.orig 2019-10-24 16:42:10 UTC +++ src/java/org/apache/cassandra/config/Config.java -@@ -252,7 +252,7 @@ public class Config +@@ -260,7 +260,7 @@ public class Config public volatile int key_cache_save_period = 14400; public volatile int key_cache_keys_to_save = Integer.MAX_VALUE;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912180227.xBI2RaZs019412>