From 0c4cda23b394fb563d24bbb0f7a461799b82a56a Mon Sep 17 00:00:00 2001
From: Mikael Urankar <mikael@FreeBSD.org>
Date: Mon, 2 Nov 2020 17:40:42 +0000
Subject: databases/cassandra4: Update to version 4.0-beta2.

PR:		250167
Submitted by:	Angelo Polo (maintainer)
---
 databases/cassandra4/files/patch-build.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'databases/cassandra4/files/patch-build.xml')

diff --git a/databases/cassandra4/files/patch-build.xml b/databases/cassandra4/files/patch-build.xml
index d93b8fb720c1..762fffca3ec4 100644
--- a/databases/cassandra4/files/patch-build.xml
+++ b/databases/cassandra4/files/patch-build.xml
@@ -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"/>
-- 
cgit v1.2.3