Author: markt
Date: Mon Jun 25 18:19:55 2018
New Revision: 1834356
URL: http://svn.apache.org/viewvc?rev=1834356&view=rev
Log:
Switch EasyMock and cglib source to Maven Central
Note that EasyMock 2.2.3 wasn't available from Maven Central so I went back a
version to 2.2.2. I confirmed that the tests pass.
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1834356&r1=1834355&r2=1834356&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Jun 25 18:19:55 2018
@@ -177,13 +177,13 @@ hamcrest.loc=${base-maven.loc}/org/hamcr
easymock.version=3.2
easymock.home=${base.path}/easymock-${easymock.version}
easymock.jar=${easymock.home}/easymock-${easymock.version}.jar
-easymock.loc=${base-sf.loc}/easymock/easymock-${easymock.version}.zip
+easymock.loc=${base-maven.loc}/org/easymock/easymock/${easymock.version}/easymock-${easymock.version}.jar
# ----- cglib, used by EasyMock, version 2.2 or later -----
-cglib.version=2.2.3
+cglib.version=2.2.2
cglib.home=${base.path}/cglib-${cglib.version}
cglib.jar=${cglib.home}/cglib-nodep-${cglib.version}.jar
-cglib.loc=${base-sf.loc}/cglib/cglib-nodep-${cglib.version}.jar
+cglib.loc=${base-maven.loc}/cglib/cglib-nodep/${cglib.version}/cglib-nodep-${cglib.version}.jar
# ----- objenesis, used by EasyMock, version 1.2 or later -----
objenesis.version=1.2
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1834356&r1=1834355&r2=1834356&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Jun 25 18:19:55 2018
@@ -2694,10 +2694,10 @@ skip.installer property in build.propert
<param name="destdir" value="${hamcrest.home}"/>
</antcall>
- <antcall target="downloadzip">
+ <antcall target="downloadfile">
<param name="sourcefile" value="${easymock.loc}"/>
<param name="destfile" value="${easymock.jar}"/>
- <param name="destdir" value="${base.path}"/>
+ <param name="destdir" value="${easymock.home}"/>
</antcall>
<antcall target="downloadfile">
Modified: tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1834356&r1=1834355&r2=1834356&view=diff
==============================================================================
--- tomcat/trunk/res/ide-support/eclipse/eclipse.classpath (original)
+++ tomcat/trunk/res/ide-support/eclipse/eclipse.classpath Mon Jun 25 18:19:55
2018
@@ -27,7 +27,7 @@
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/ecj-4.7.3a/ecj-4.7.3a.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/easymock-3.2/easymock-3.2.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/hamcrest-1.3/hamcrest-core-1.3.jar"/>
- <classpathentry kind="var"
path="TOMCAT_LIBS_BASE/cglib-2.2.3/cglib-nodep-2.2.3.jar"/>
+ <classpathentry kind="var"
path="TOMCAT_LIBS_BASE/cglib-2.2.2/cglib-nodep-2.2.2.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/objenesis-1.2/objenesis-1.2.jar"/>
<classpathentry kind="output" path=".settings/output"/>
</classpath>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
