diff options
Diffstat (limited to 'databases/cassandra3/files/patch-build.xml')
| -rw-r--r-- | databases/cassandra3/files/patch-build.xml | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/databases/cassandra3/files/patch-build.xml b/databases/cassandra3/files/patch-build.xml index 48899c46ea88..c6bb818a1c09 100644 --- a/databases/cassandra3/files/patch-build.xml +++ b/databases/cassandra3/files/patch-build.xml @@ -1,4 +1,4 @@ ---- build.xml.orig 2020-02-10 22:55:14 UTC +--- build.xml.orig 2020-10-20 17:07:48 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="3.11.6"/> + <property name="base.version" value="3.11.9"/> @@ -80,14 +81,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,8 +247,7 @@ +@@ -247,8 +248,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"> -@@ -260,6 +260,7 @@ +@@ -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"/> @@ -43,7 +43,7 @@ </exec> <exec executable="cmd" osfamily="dos" dir="${doc.dir}"> <arg value="/c"/> -@@ -302,10 +303,6 @@ +@@ -303,10 +304,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"/> -@@ -695,16 +692,14 @@ +@@ -706,16 +703,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"/> -@@ -717,7 +712,7 @@ +@@ -728,7 +723,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"/> -@@ -738,8 +733,7 @@ +@@ -749,8 +744,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"/> -@@ -1034,6 +1028,88 @@ +@@ -1045,6 +1039,88 @@ </jar> </target> @@ -181,7 +181,17 @@ <!-- creates release tarballs --> <target name="artifacts" depends="jar,javadoc,gen-doc" description="Create Cassandra release artifacts"> -@@ -1776,8 +1852,8 @@ +@@ -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> @@ -192,7 +202,7 @@ <arg value="-n"/> <arg value="hw.ncpu"/> </exec> -@@ -1797,6 +1873,11 @@ +@@ -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"/> |