This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit cd73c14cec6417a100e2f667671eef2f485a34ea Merge: 40f4fe7 44d81b5 Author: Mick Semb Wever <[email protected]> AuthorDate: Wed Nov 17 10:27:31 2021 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 .build/build-resolver.xml | 66 +++++++++++++++++++++++------------------------ build.xml | 4 ++- 2 files changed, 36 insertions(+), 34 deletions(-) diff --cc .build/build-resolver.xml index 02722f8,de98eed..698fb57 --- a/.build/build-resolver.xml +++ b/.build/build-resolver.xml @@@ -21,12 -21,8 +21,12 @@@ <!-- 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"; /> + + <!-- version of lib/ downloads --> + <property name="lib.download.sha" value="27de93ebb1285e731570eb8585d66832c79c4289"/> + <condition property="resolver-ant-tasks.jar.exists"> <available file="${resolver-ant-tasks.local}" /> </condition> @@@ -151,9 -143,8 +151,9 @@@ <files dir="${test.lib}/jars" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="test,!provide,!system"/> </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> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
