You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2021/11/17 10:01:06 UTC
[cassandra] branch cassandra-3.0 updated: Create property for local repository
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-3.0 by this push:
new 44d81b5 Create property for local repository
44d81b5 is described below
commit 44d81b5d09147fa2de505b4f03bcaa2e9017a9b2
Author: Sumanth Pasupuleti <sp...@netflix.com>
AuthorDate: Fri Sep 3 11:03:41 2021 -0700
Create property for local repository
patch by Sumanth Pasupuleti; reviewed by Mick Semb Wever for CASSANDRA-16917
---
.build/build-resolver.xml | 66 +++++++++++++++++++++++------------------------
build.xml | 4 ++-
2 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/.build/build-resolver.xml b/.build/build-resolver.xml
index 8a413bf..de98eed 100644
--- a/.build/build-resolver.xml
+++ b/.build/build-resolver.xml
@@ -21,7 +21,7 @@
<!-- details of what version of Resolver ANT Tasks to fetch -->
<property name="resolver-ant-tasks.version" value="1.3.0" />
- <property name="resolver-ant-tasks.local" value="${user.home}/.m2/repository/org/apache/maven/resolver/maven-resolver-ant-tasks/${resolver-ant-tasks.version}/maven-resolver-ant-tasks-${resolver-ant-tasks.version}.jar"/>
+ <property name="resolver-ant-tasks.local" value="${local.repository}/org/apache/maven/resolver/maven-resolver-ant-tasks/${resolver-ant-tasks.version}/maven-resolver-ant-tasks-${resolver-ant-tasks.version}.jar"/>
<property name="resolver-ant-tasks.url" value="https://repo1.maven.org/maven2/org/apache/maven/resolver/maven-resolver-ant-tasks" />
<condition property="resolver-ant-tasks.jar.exists">
<available file="${resolver-ant-tasks.local}" />
@@ -38,7 +38,7 @@
<target name="_resolver_download" unless="resolver-ant-tasks.jar.exists" description="Fetch Resolver ANT Tasks from Maven Central Repository">
<echo>Downloading Resolver ANT Tasks...</echo>
- <mkdir dir="${user.home}/.m2/repository/org/apache/maven/resolver/maven-resolver-ant-tasks/${resolver-ant-tasks.version}" />
+ <mkdir dir="${local.repository}/org/apache/maven/resolver/maven-resolver-ant-tasks/${resolver-ant-tasks.version}" />
<get src="${resolver-ant-tasks.url}/${resolver-ant-tasks.version}/maven-resolver-ant-tasks-${resolver-ant-tasks.version}-uber.jar"
dest="${resolver-ant-tasks.local}" usetimestamp="true" quiet="true"/>
@@ -144,7 +144,7 @@
</resolver:resolve>
<!-- jacoco agent jar comes wrapped in a jar -->
- <unzip src="${user.home}/.m2/repository/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}.jar" dest="${build.dir.lib}/jars">
+ <unzip src="${local.repository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}.jar" dest="${build.dir.lib}/jars">
<patternset>
<include name="*.jar"/>
</patternset>
@@ -165,18 +165,18 @@
<dependencies pomRef="thrift-pom"/>
<files dir="${build.lib}" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="compile,!provide,!system"/>
</resolver:resolve>
- <mkdir dir="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin"/>
+ <mkdir dir="${local.repository}/org/apache/cassandra/deps/sigar-bin"/>
<mkdir dir="${build.lib}/sigar-bin"/>
<!-- 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/59/a0/cf4cd997e1750f0c2d91c6ea5abea218251c43c3581bcc2f118b00baf5cf/futures-2.1.6-py2.py3-none-any.whl" dest="${local.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="${local.repository}/org/apache/cassandra/deps/six-1.7.3-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"/>
+ <get src="https://raw.githubusercontent.com/apache/cassandra/${lib.download.sha}/lib/cassandra-driver-internal-only-3.11.0-bb96859b.zip" dest="${local.repository}/org/apache/cassandra/deps/cassandra-driver-internal-only-3.11.0-bb96859b.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
<!-- apache/cassandra/lib -->
- <get dest="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/" quiet="true" usetimestamp="true" skipexisting="true">
+ <get dest="${local.repository}/org/apache/cassandra/deps/sigar-bin/" quiet="true" usetimestamp="true" skipexisting="true">
<url url="https://raw.githubusercontent.com/apache/cassandra/${lib.download.sha}/lib/sigar-bin/libsigar-amd64-freebsd-6.so"/>
<url url="https://raw.githubusercontent.com/apache/cassandra/${lib.download.sha}/lib/sigar-bin/libsigar-amd64-linux.so"/>
<url url="https://raw.githubusercontent.com/apache/cassandra/${lib.download.sha}/lib/sigar-bin/libsigar-amd64-solaris.so"/>
@@ -202,33 +202,33 @@
</get>
<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="${local.repository}/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/cassandra-driver-internal-only-3.11.0-bb96859b.zip"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/six-1.7.3-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"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-linux.so"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-solaris.so"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-ia64-hpux-11.sl"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-ia64-linux.so"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-pa-hpux-11.sl"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-ppc-aix-5.so"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-ppc-linux.so"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-ppc64-aix-5.so"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-ppc64-linux.so"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-s390x-linux.so"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-sparc-solaris.so"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-sparc64-solaris.so"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-universal-macosx.dylib"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-universal64-macosx.dylib"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-x86-freebsd-5.so"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-x86-freebsd-6.so"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-x86-linux.so"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-x86-solaris.so"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/sigar-amd64-winnt.dll"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/sigar-x86-winnt.dll"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/sigar-x86-winnt.lib"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-freebsd-6.so"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-linux.so"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-solaris.so"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ia64-hpux-11.sl"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ia64-linux.so"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-pa-hpux-11.sl"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ppc-aix-5.so"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ppc-linux.so"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ppc64-aix-5.so"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ppc64-linux.so"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-s390x-linux.so"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-sparc-solaris.so"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-sparc64-solaris.so"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-universal-macosx.dylib"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-universal64-macosx.dylib"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-freebsd-5.so"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-freebsd-6.so"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-linux.so"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-solaris.so"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/sigar-amd64-winnt.dll"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/sigar-x86-winnt.dll"/>
+ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/sigar-x86-winnt.lib"/>
</copy>
</target>
</project>
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 7cc0693..b42c8ea 100644
--- a/build.xml
+++ b/build.xml
@@ -78,9 +78,11 @@
value="${build.src.resources}/org/apache/cassandra/config/" />
<property name="final.name" value="${ant.project.name}-${version}"/>
+ <property name="local.repository" value="${user.home}/.m2/repository" />
+
<!-- details of what version of Maven ANT Tasks to fetch -->
<property name="maven-ant-tasks.version" value="2.1.3" />
- <property name="maven-ant-tasks.local" value="${user.home}/.m2/repository/org/apache/maven/maven-ant-tasks"/>
+ <property name="maven-ant-tasks.local" value="${local.repository}/org/apache/maven/maven-ant-tasks"/>
<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 -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org