This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 78fae4dbd64a6eb6ceb3f5111586465ffd7dbfe3
Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org>
AuthorDate: Tue Jun 9 15:31:22 2020 +0300
Update Easymock to 4.2
Fix IDEA project template to use JUnit from Tomcat build dependencies
(cherry picked from commit e461544285af912830887f5cc3c5cc74a1f648eb)
---
build.properties.default | 6 +++---
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 18 ++++++++----------
res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml | 2 +-
5 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 7b07ffe..fac449a 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -226,10 +226,10 @@
hamcrest.jar=${hamcrest.home}/hamcrest-${hamcrest.version}.jar
hamcrest.loc=${base-maven.loc}/org/hamcrest/hamcrest/${hamcrest.version}/hamcrest-${hamcrest.version}.jar
# ----- EasyMock, version 3.2 or later -----
-easymock.version=3.2
+easymock.version=4.2
easymock.checksum.enabled=true
-easymock.checksum.algorithm=MD5|SHA-1
-easymock.checksum.value=0da4291328e18798621c36fdf8bc4c3a|00c82f7fa3ef377d8954b1db25123944b5af2ba4
+easymock.checksum.algorithm=SHA-512
+easymock.checksum.value=6fbc3080c9f12aa8dcd1db8aa74e1621caa1d437c0fa64c70a3fe0d46ff74ac2d8d87ac544550487b7aaae98844d4d9d114c724bfc6d9a8873136353f87d8f2e
easymock.home=${base.path}/easymock-${easymock.version}
easymock.jar=${easymock.home}/easymock-${easymock.version}.jar
easymock.loc=${base-maven.loc}/org/easymock/easymock/${easymock.version}/easymock-${easymock.version}.jar
diff --git a/res/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index b20401d..7e11485 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -25,7 +25,7 @@
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/wsdl4j-1.6.3/wsdl4j-1.6.3.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/ecj-4.6.3/ecj-4.6.3.jar"/>
- <classpathentry kind="var"
path="TOMCAT_LIBS_BASE/easymock-3.2/easymock-3.2.jar"/>
+ <classpathentry kind="var"
path="TOMCAT_LIBS_BASE/easymock-4.2/easymock-4.2.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/hamcrest-2.2/hamcrest-2.2.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"/>
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 48aa528..67d416d 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -26,29 +26,27 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <!-- Use JUnit that ships with IDEA !-->
+ <!-- Use ant.jar from path variable ANT_HOME !-->
<orderEntry type="module-library">
- <library name="junit4">
+ <library>
<CLASSES>
- <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.13.jar!/" />
+ <root url="jar://$ANT_HOME$/lib/ant.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <!-- Use ant.jar from path variable ANT_HOME !-->
+ <!-- Use built libraries from path variable TOMCAT_BUILD_LIBS !-->
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$ANT_HOME$/lib/ant.jar!/" />
+ <root url="jar://$TOMCAT_BUILD_LIBS$/junit-4.13/junit-4.13.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
-
- <!-- Use built libraries from path variable TOMCAT_BUILD_LIBS !-->
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -79,7 +77,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$TOMCAT_BUILD_LIBS$/easymock-3.2/easymock-3.2.jar!/" />
+ <root
url="jar://$TOMCAT_BUILD_LIBS$/easymock-4.2/easymock-4.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -88,7 +86,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$TOMCAT_BUILD_LIBS$/hamcrest-1.3/hamcrest-core-1.3.jar!/" />
+ <root
url="jar://$TOMCAT_BUILD_LIBS$/hamcrest-2.2/hamcrest-2.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -114,4 +112,4 @@
</orderEntry>
</component>
-</module>
\ No newline at end of file
+</module>
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties
b/res/ide-support/netbeans/nb-tomcat-build.properties
index 2306f37..3007a45 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
# it is not possible to retrieve the classpaths from the build to
# use in the NetBeans targets, so they must be explicitly declared
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/objenesis-1.2/objenesis-1.2.jar:${base.path}/cglib-2.2.2/cglib-nodep-2.2.2.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.6.3/ecj-4.6.3.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-1.2/objenesis-1.2.jar:${base.path}/cglib-2.2.2/cglib-nodep-2.2.2.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.6.3/ecj-4.6.3.jar:${tomcat.classes}
# Extra properties used by the Tomcat project additional NetBeans targets.
diff --git a/res/ide-support/netbeans/project.xml
b/res/ide-support/netbeans/project.xml
index f113d6f..9917745 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -189,7 +189,7 @@
<compilation-unit>
<package-root>test</package-root>
<unit-tests/>
- <classpath
mode="compile">output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/objenesis-1.2/objenesis-1.2.jar:${base.path}/cglib-2.2.2/cglib-nodep-2.2.2.jar:${base.path}/hamcrest/hamcrest-2.2.jar</classpath>
+ <classpath
mode="compile">output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-1.2/objenesis-1.2.jar:${base.path}/cglib-2.2.2/cglib-nodep-2.2.2.jar:${base.path}/hamcrest/hamcrest-2.2.jar</classpath>
<source-level>1.7</source-level>
</compilation-unit>
</java-data>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
