You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by sd...@apache.org on 2015/05/31 08:24:11 UTC
svn commit: r1682680 - in /velocity/engine/branches/1.x/build:
build.properties download.xml
Author: sdumitriu
Date: Sun May 31 06:24:10 2015
New Revision: 1682680
URL: http://svn.apache.org/r1682680
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.x/build/build.properties
velocity/engine/branches/1.x/build/download.xml
Modified: velocity/engine/branches/1.x/build/build.properties
URL: http://svn.apache.org/viewvc/velocity/engine/branches/1.x/build/build.properties?rev=1682680&r1=1682679&r2=1682680&view=diff
==============================================================================
--- velocity/engine/branches/1.x/build/build.properties (original)
+++ velocity/engine/branches/1.x/build/build.properties Sun May 31 06:24:10 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.x/build/download.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/1.x/build/download.xml?rev=1682680&r1=1682679&r2=1682680&view=diff
==============================================================================
--- velocity/engine/branches/1.x/build/download.xml (original)
+++ velocity/engine/branches/1.x/build/download.xml Sun May 31 06:24:10 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"
Re: svn commit: r1682680 - in /velocity/engine/branches/1.x/build:
build.properties download.xml
Posted by Mike Kienenberger <mk...@gmail.com>.
I think for the older branches we don't need to support newer versions
of java. If someone needs it, then they are probably already using
an ancient version of java, or are willing to get one, or are willing
to make the changes necessary to get it working. As long as the
build could work with the correct tool-chain installed, we've gone
above and beyond what's necessary.
I have Velocity_1.5_BRANCH building under java 1.8 with the only
change being the download patch using "ant jar". For an ancient
branch, I think that's sufficient.
Making "ant test" work under Java 1.8 requires a trivial update for
DataSource (what needs to be done is said in the compiler error):
public Logger getParentLogger() throws SQLFeatureNotSupportedException {
throw new SQLFeatureNotSupportedException();
}
and passes all tests but one:
[junit] Test org.apache.velocity.test.issues.VelTools66TestCase FAILED
I suppose we could fix it if you like, though, as it shouldn't break
anything under ancient versions of java, but I'd say leave it alone.
Fixing the build script is reasonable, but changing the code to
provide forward-compatibility isn't something anyone would expect.
So I think that's good enough.
Running "ant package" on velocity 1.5 using Java 1.8 requires setting
your current java version in the build.properties:
dist.required.java.version = 1.8
That seems fine the way it is.
On Sun, May 31, 2015 at 5:43 PM, Sergiu Dumitriu
<se...@gmail.com> wrote:
> OK, I applied the patch on the 1.5 branch as well.
>
> Building that branch still fails.
>
> With JDK1.7 there's a missing implementation for a new method added in a
> standard interface.
>
> With JDK1.6 packaging fails since the build script insists on building
> with a 1.4 JDK, and I doubt people still have one of those around.
>
> On 05/31/2015 01:15 PM, Mike Kienenberger wrote:
>> What's the 1.x branch?
>>
>> We should also make sure that the 1.5 patch is applied to the
>> Velocity_1.5_BRANCH branch so someone checking out from svn can at
>> least build 1.5 from source, although, like 1.6, I doubt we will be
>> making another release.
>>
>> On Sun, May 31, 2015 at 2:24 AM, <sd...@apache.org> wrote:
>>> Author: sdumitriu
>>> Date: Sun May 31 06:24:10 2015
>>> New Revision: 1682680
>>>
>>> URL: http://svn.apache.org/r1682680
>>> 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.x/build/build.properties
>>> velocity/engine/branches/1.x/build/download.xml
>>>
>>> Modified: velocity/engine/branches/1.x/build/build.properties
>>> URL: http://svn.apache.org/viewvc/velocity/engine/branches/1.x/build/build.properties?rev=1682680&r1=1682679&r2=1682680&view=diff
>>> ==============================================================================
>>> --- velocity/engine/branches/1.x/build/build.properties (original)
>>> +++ velocity/engine/branches/1.x/build/build.properties Sun May 31 06:24:10 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.x/build/download.xml
>>> URL: http://svn.apache.org/viewvc/velocity/engine/branches/1.x/build/download.xml?rev=1682680&r1=1682679&r2=1682680&view=diff
>>> ==============================================================================
>>> --- velocity/engine/branches/1.x/build/download.xml (original)
>>> +++ velocity/engine/branches/1.x/build/download.xml Sun May 31 06:24:10 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"
>>>
>>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@velocity.apache.org
>> For additional commands, e-mail: dev-help@velocity.apache.org
>>
>
>
> --
> Sergiu Dumitriu
> http://purl.org/net/sergiu/
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@velocity.apache.org
> For additional commands, e-mail: dev-help@velocity.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@velocity.apache.org
For additional commands, e-mail: dev-help@velocity.apache.org
Re: svn commit: r1682680 - in /velocity/engine/branches/1.x/build:
build.properties download.xml
Posted by Nathan Bubna <nb...@gmail.com>.
Heh. Pretty sure we don't actually need any new releases (even of the 1.5
branch) to target 1.4. In fact, i don't believe we need or want any new
1.5.x releases. We've long considered 1.5 to be flawed, with major
performance regressions. Don't waste your time on it. :)
On Sun, May 31, 2015 at 2:43 PM, Sergiu Dumitriu <se...@gmail.com>
wrote:
> OK, I applied the patch on the 1.5 branch as well.
>
> Building that branch still fails.
>
> With JDK1.7 there's a missing implementation for a new method added in a
> standard interface.
>
> With JDK1.6 packaging fails since the build script insists on building
> with a 1.4 JDK, and I doubt people still have one of those around.
>
> On 05/31/2015 01:15 PM, Mike Kienenberger wrote:
> > What's the 1.x branch?
> >
> > We should also make sure that the 1.5 patch is applied to the
> > Velocity_1.5_BRANCH branch so someone checking out from svn can at
> > least build 1.5 from source, although, like 1.6, I doubt we will be
> > making another release.
> >
> > On Sun, May 31, 2015 at 2:24 AM, <sd...@apache.org> wrote:
> >> Author: sdumitriu
> >> Date: Sun May 31 06:24:10 2015
> >> New Revision: 1682680
> >>
> >> URL: http://svn.apache.org/r1682680
> >> 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.x/build/build.properties
> >> velocity/engine/branches/1.x/build/download.xml
> >>
> >> Modified: velocity/engine/branches/1.x/build/build.properties
> >> URL:
> http://svn.apache.org/viewvc/velocity/engine/branches/1.x/build/build.properties?rev=1682680&r1=1682679&r2=1682680&view=diff
> >>
> ==============================================================================
> >> --- velocity/engine/branches/1.x/build/build.properties (original)
> >> +++ velocity/engine/branches/1.x/build/build.properties Sun May 31
> 06:24:10 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.x/build/download.xml
> >> URL:
> http://svn.apache.org/viewvc/velocity/engine/branches/1.x/build/download.xml?rev=1682680&r1=1682679&r2=1682680&view=diff
> >>
> ==============================================================================
> >> --- velocity/engine/branches/1.x/build/download.xml (original)
> >> +++ velocity/engine/branches/1.x/build/download.xml Sun May 31 06:24:10
> 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"
> >>
> >>
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@velocity.apache.org
> > For additional commands, e-mail: dev-help@velocity.apache.org
> >
>
>
> --
> Sergiu Dumitriu
> http://purl.org/net/sergiu/
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@velocity.apache.org
> For additional commands, e-mail: dev-help@velocity.apache.org
>
>
Re: svn commit: r1682680 - in /velocity/engine/branches/1.x/build:
build.properties download.xml
Posted by Sergiu Dumitriu <se...@gmail.com>.
OK, I applied the patch on the 1.5 branch as well.
Building that branch still fails.
With JDK1.7 there's a missing implementation for a new method added in a
standard interface.
With JDK1.6 packaging fails since the build script insists on building
with a 1.4 JDK, and I doubt people still have one of those around.
On 05/31/2015 01:15 PM, Mike Kienenberger wrote:
> What's the 1.x branch?
>
> We should also make sure that the 1.5 patch is applied to the
> Velocity_1.5_BRANCH branch so someone checking out from svn can at
> least build 1.5 from source, although, like 1.6, I doubt we will be
> making another release.
>
> On Sun, May 31, 2015 at 2:24 AM, <sd...@apache.org> wrote:
>> Author: sdumitriu
>> Date: Sun May 31 06:24:10 2015
>> New Revision: 1682680
>>
>> URL: http://svn.apache.org/r1682680
>> 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.x/build/build.properties
>> velocity/engine/branches/1.x/build/download.xml
>>
>> Modified: velocity/engine/branches/1.x/build/build.properties
>> URL: http://svn.apache.org/viewvc/velocity/engine/branches/1.x/build/build.properties?rev=1682680&r1=1682679&r2=1682680&view=diff
>> ==============================================================================
>> --- velocity/engine/branches/1.x/build/build.properties (original)
>> +++ velocity/engine/branches/1.x/build/build.properties Sun May 31 06:24:10 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.x/build/download.xml
>> URL: http://svn.apache.org/viewvc/velocity/engine/branches/1.x/build/download.xml?rev=1682680&r1=1682679&r2=1682680&view=diff
>> ==============================================================================
>> --- velocity/engine/branches/1.x/build/download.xml (original)
>> +++ velocity/engine/branches/1.x/build/download.xml Sun May 31 06:24:10 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"
>>
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@velocity.apache.org
> For additional commands, e-mail: dev-help@velocity.apache.org
>
--
Sergiu Dumitriu
http://purl.org/net/sergiu/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@velocity.apache.org
For additional commands, e-mail: dev-help@velocity.apache.org
Re: svn commit: r1682680 - in /velocity/engine/branches/1.x/build:
build.properties download.xml
Posted by Mike Kienenberger <mk...@gmail.com>.
Thanks. Makes perfect sense now that you've said it :)
On Sun, May 31, 2015 at 3:22 PM, Nathan Bubna <nb...@gmail.com> wrote:
> The 1.x branch is the "head" of 1.x development. Effectively, it's what
> could become a 1.8 version.
>
> On Sun, May 31, 2015 at 10:15 AM, Mike Kienenberger <mk...@gmail.com>
> wrote:
>
>> What's the 1.x branch?
>>
>> We should also make sure that the 1.5 patch is applied to the
>> Velocity_1.5_BRANCH branch so someone checking out from svn can at
>> least build 1.5 from source, although, like 1.6, I doubt we will be
>> making another release.
>>
>> On Sun, May 31, 2015 at 2:24 AM, <sd...@apache.org> wrote:
>> > Author: sdumitriu
>> > Date: Sun May 31 06:24:10 2015
>> > New Revision: 1682680
>> >
>> > URL: http://svn.apache.org/r1682680
>> > 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.x/build/build.properties
>> > velocity/engine/branches/1.x/build/download.xml
>> >
>> > Modified: velocity/engine/branches/1.x/build/build.properties
>> > URL:
>> http://svn.apache.org/viewvc/velocity/engine/branches/1.x/build/build.properties?rev=1682680&r1=1682679&r2=1682680&view=diff
>> >
>> ==============================================================================
>> > --- velocity/engine/branches/1.x/build/build.properties (original)
>> > +++ velocity/engine/branches/1.x/build/build.properties Sun May 31
>> 06:24:10 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.x/build/download.xml
>> > URL:
>> http://svn.apache.org/viewvc/velocity/engine/branches/1.x/build/download.xml?rev=1682680&r1=1682679&r2=1682680&view=diff
>> >
>> ==============================================================================
>> > --- velocity/engine/branches/1.x/build/download.xml (original)
>> > +++ velocity/engine/branches/1.x/build/download.xml Sun May 31 06:24:10
>> 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"
>> >
>> >
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@velocity.apache.org
>> For additional commands, e-mail: dev-help@velocity.apache.org
>>
>>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@velocity.apache.org
For additional commands, e-mail: dev-help@velocity.apache.org
Re: svn commit: r1682680 - in /velocity/engine/branches/1.x/build:
build.properties download.xml
Posted by Nathan Bubna <nb...@gmail.com>.
The 1.x branch is the "head" of 1.x development. Effectively, it's what
could become a 1.8 version.
On Sun, May 31, 2015 at 10:15 AM, Mike Kienenberger <mk...@gmail.com>
wrote:
> What's the 1.x branch?
>
> We should also make sure that the 1.5 patch is applied to the
> Velocity_1.5_BRANCH branch so someone checking out from svn can at
> least build 1.5 from source, although, like 1.6, I doubt we will be
> making another release.
>
> On Sun, May 31, 2015 at 2:24 AM, <sd...@apache.org> wrote:
> > Author: sdumitriu
> > Date: Sun May 31 06:24:10 2015
> > New Revision: 1682680
> >
> > URL: http://svn.apache.org/r1682680
> > 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.x/build/build.properties
> > velocity/engine/branches/1.x/build/download.xml
> >
> > Modified: velocity/engine/branches/1.x/build/build.properties
> > URL:
> http://svn.apache.org/viewvc/velocity/engine/branches/1.x/build/build.properties?rev=1682680&r1=1682679&r2=1682680&view=diff
> >
> ==============================================================================
> > --- velocity/engine/branches/1.x/build/build.properties (original)
> > +++ velocity/engine/branches/1.x/build/build.properties Sun May 31
> 06:24:10 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.x/build/download.xml
> > URL:
> http://svn.apache.org/viewvc/velocity/engine/branches/1.x/build/download.xml?rev=1682680&r1=1682679&r2=1682680&view=diff
> >
> ==============================================================================
> > --- velocity/engine/branches/1.x/build/download.xml (original)
> > +++ velocity/engine/branches/1.x/build/download.xml Sun May 31 06:24:10
> 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"
> >
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@velocity.apache.org
> For additional commands, e-mail: dev-help@velocity.apache.org
>
>
Re: svn commit: r1682680 - in /velocity/engine/branches/1.x/build:
build.properties download.xml
Posted by Mike Kienenberger <mk...@gmail.com>.
What's the 1.x branch?
We should also make sure that the 1.5 patch is applied to the
Velocity_1.5_BRANCH branch so someone checking out from svn can at
least build 1.5 from source, although, like 1.6, I doubt we will be
making another release.
On Sun, May 31, 2015 at 2:24 AM, <sd...@apache.org> wrote:
> Author: sdumitriu
> Date: Sun May 31 06:24:10 2015
> New Revision: 1682680
>
> URL: http://svn.apache.org/r1682680
> 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.x/build/build.properties
> velocity/engine/branches/1.x/build/download.xml
>
> Modified: velocity/engine/branches/1.x/build/build.properties
> URL: http://svn.apache.org/viewvc/velocity/engine/branches/1.x/build/build.properties?rev=1682680&r1=1682679&r2=1682680&view=diff
> ==============================================================================
> --- velocity/engine/branches/1.x/build/build.properties (original)
> +++ velocity/engine/branches/1.x/build/build.properties Sun May 31 06:24:10 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.x/build/download.xml
> URL: http://svn.apache.org/viewvc/velocity/engine/branches/1.x/build/download.xml?rev=1682680&r1=1682679&r2=1682680&view=diff
> ==============================================================================
> --- velocity/engine/branches/1.x/build/download.xml (original)
> +++ velocity/engine/branches/1.x/build/download.xml Sun May 31 06:24:10 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"
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@velocity.apache.org
For additional commands, e-mail: dev-help@velocity.apache.org