Author: sdumitriu
Date: Sun May 31 06:25:58 2015
New Revision: 1682681
URL: http://svn.apache.org/r1682681
Log:
VELOCITY-860: Fix Velocity 1.7.x, 1.6.x, 1.5 ant download dependency build
script
Patch from Mike Kienenberger applied without changes
Modified:
velocity/engine/branches/1.7.x/build/build.properties
velocity/engine/branches/1.7.x/build/download.xml
Modified: velocity/engine/branches/1.7.x/build/build.properties
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/1.7.x/build/build.properties?rev=1682681&r1=1682680&r2=1682681&view=diff
==============================================================================
--- velocity/engine/branches/1.7.x/build/build.properties (original)
+++ velocity/engine/branches/1.7.x/build/build.properties Sun May 31 06:25:58
2015
@@ -119,8 +119,8 @@ proxy.port= 80
#
# We download directly from the ibiblio maven repository
-repo.m1.url= http://www.ibiblio.org/maven
-repo.m2.url=http://www.ibiblio.org/maven2
+repo.m1.url= http://mirrors.ibiblio.org/maven2
+repo.m2.url=http://mirrors.ibiblio.org/maven2
#
# Jars to be downloaded
jar.antlr.version= 2.7.5
Modified: velocity/engine/branches/1.7.x/build/download.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/1.7.x/build/download.xml?rev=1682681&r1=1682680&r2=1682681&view=diff
==============================================================================
--- velocity/engine/branches/1.7.x/build/download.xml (original)
+++ velocity/engine/branches/1.7.x/build/download.xml Sun May 31 06:25:58 2015
@@ -62,7 +62,7 @@
<target name="do-http-m1-download" unless="skip-download">
<setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
- <get
src="${repo.m1.url}/${download.groupId}/jars/${download.artifactId}-${download.version}.jar"
+ <get
src="${repo.m1.url}/${download.groupId}/${download.artifactId}/${download.version}/${download.artifactId}-${download.version}.jar"
dest="${build.lib}/${download.artifactId}-${download.version}.jar"
usetimestamp="true"
verbose="false"
@@ -84,7 +84,7 @@
<target name="do-http-test-m1-download" unless="skip-download">
<setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
- <get
src="${repo.m1.url}/${download.groupId}/jars/${download.artifactId}-${download.version}.jar"
+ <get
src="${repo.m1.url}/${download.groupId}/${download.artifactId}/${download.version}/${download.artifactId}-${download.version}.jar"
dest="${build.test.lib}/${download.artifactId}-${download.version}.jar"
usetimestamp="true"
verbose="false"