Author: kkolinko
Date: Tue Jun 11 15:58:38 2013
New Revision: 1491854
URL: http://svn.apache.org/r1491854
Log:
Merged r1491485, r1491841 from tomcat/trunk:
- Change Maven Central repository location to be repo.maven.apache.org
- Update junit to version 4.9
- Download it from Maven Central instead of GitHub
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1491485,1491841
Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1491854&r1=1491853&r2=1491854&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Tue Jun 11 15:58:38 2013
@@ -69,7 +69,8 @@ base-tomcat.loc.1=${base-apache.loc.1}/t
base-tomcat.loc.2=${base-apache.loc.2}/tomcat
base-sf.loc=http://downloads.sourceforge.net
-base-maven.loc=http://repo2.maven.org/maven2
+# repo.maven.apache.org is the same as repo2.maven.org
+base-maven.loc=http://repo.maven.apache.org/maven2
# Mirror, was used when there were problems with the main SF downloads site
# base-sf.loc=http://sunet.dl.sourceforge.net
@@ -176,10 +177,10 @@ commons-daemon.native.win.loc.1=${base-c
commons-daemon.native.win.loc.2=${base-commons.loc.2}/daemon/binaries/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
# ----- JUnit Unit Test Suite, version 4.8 or later -----
-junit.home=${base.path}/junit4.8.2
-junit.lib=${junit.home}
-junit.jar=${junit.lib}/junit-4.8.2.jar
-junit.loc=http://cloud.github.com/downloads/KentBeck/junit/junit4.8.2.zip
+junit.version=4.9
+junit.home=${base.path}/junit${junit.version}
+junit.jar=${junit.home}/junit-${junit.version}.jar
+junit.loc=${base-maven.loc}/junit/junit/${junit.version}/junit-${junit.version}.jar
# ----- Checkstyle, version 5.1 or later -----
checkstyle.version=5.6
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1491854&r1=1491853&r2=1491854&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Tue Jun 11 15:58:38 2013
@@ -2372,10 +2372,10 @@ Apache Tomcat ${version} native binaries
<target name="download-test-compile"
description="Download additional components for the tests" >
- <antcall target="downloadzip">
+ <antcall target="downloadfile">
<param name="sourcefile" value="${junit.loc}"/>
<param name="destfile" value="${junit.jar}"/>
- <param name="destdir" value="${base.path}"/>
+ <param name="destdir" value="${junit.home}"/>
</antcall>
</target>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1491854&r1=1491853&r2=1491854&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jun 11 15:58:38 2013
@@ -69,6 +69,17 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <update>
+ Update Maven Cental location used to download dependencies at build
time
+ to be <code>repo.maven.apache.org</code>. (kkolinko)
+ </update>
+ <update>
+ Update JUnit to version 4.9. (kkolinko)
+ </update>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.41 (markt)" rtext="2013-06-10">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
