This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 9b4b1fdd36 Update EasyMock to 5.3.0
9b4b1fdd36 is described below
commit 9b4b1fdd3661389efe48bbbd90eb8cc227b37930
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 26 17:14:29 2024 +0100
Update EasyMock to 5.3.0
---
build.properties.default | 17 +++++++++++++----
build.xml | 11 +++++++++++
webapps/docs/changelog.xml | 4 ++++
3 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 01e7dc000b..e4929239c4 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -216,16 +216,16 @@ hamcrest.home=${base.path}/hamcrest-${hamcrest.version}
hamcrest.jar=${hamcrest.home}/hamcrest-${hamcrest.version}.jar
hamcrest.loc=${base-maven.loc}/org/hamcrest/hamcrest/${hamcrest.version}/hamcrest-${hamcrest.version}.jar
-# ----- EasyMock, version 4.0 or later -----
-easymock.version=4.3
+# ----- EasyMock, version 5.0.0 or later -----
+easymock.version=5.3.0
easymock.checksum.enabled=true
easymock.checksum.algorithm=MD5|SHA-1
-easymock.checksum.value=f4d141b8c32c022def9089ee4f890c90|b0dbe2df1a71b8115835561f46a8f06cb168a94f
+easymock.checksum.value=a25d1fb058ddcb644011680e48ba357c|7bac0b4bbd84f49f9bcd8485281b5e52da081fa4
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
-# ----- objenesis, used by EasyMock, version 3.0.1 or later -----
+# ----- objenesis, used by EasyMock, version 3.3 or later -----
objenesis.version=3.4
objenesis.checksum.enabled=true
objenesis.checksum.algorithm=MD5|SHA-1
@@ -234,6 +234,15 @@ objenesis.home=${base.path}/objenesis-${objenesis.version}
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
+# ----- byte-buddy, used by EasyMock, version 1.12.18 or later -----
+bytebuddy.version=1.14.17
+bytebuddy.checksum.enabled=true
+bytebuddy.checksum.algorithm=MD5|SHA-1
+bytebuddy.checksum.value=9236614cb260676d7b7489ca96da4af4|a8d08f3c1e75ecc7f38a8cfd7e9fa47919096373
+bytebuddy.home=${base.path}/byte-buddy-${bytebuddy.version}
+bytebuddy.jar=${bytebuddy.home}/byte-buddy-${bytebuddy.version}.jar
+bytebuddy.loc=${base-maven.loc}/net/bytebuddy/byte-buddy/${bytebuddy.version}/byte-buddy-${bytebuddy.version}.jar
+
# ----- UnboundID, used by unit tests, version 5.1.4 or later -----
unboundid.version=7.0.1
unboundid.checksum.enabled=true
diff --git a/build.xml b/build.xml
index 214ccb2cfd..0a12832898 100644
--- a/build.xml
+++ b/build.xml
@@ -248,6 +248,7 @@
<pathelement location="${hamcrest.jar}"/>
<pathelement location="${easymock.jar}"/>
<pathelement location="${objenesis.jar}"/>
+ <pathelement location="${bytebuddy.jar}"/>
<pathelement location="${unboundid.jar}"/>
<pathelement location="${derby.jar}"/>
<pathelement location="${derby-shared.jar}"/>
@@ -263,6 +264,7 @@
<filter token="EASYMOCK_JAR" value="${easymock.jar}"/>
<filter token="HAMCREST_JAR" value="${hamcrest.jar}"/>
<filter token="OBJENESIS_JAR" value="${objenesis.jar}"/>
+ <filter token="BYTEBUDDY_JAR" value="${bytebuddy.jar}"/>
<filter token="BND_JAR" value="${bnd.jar}"/>
<filter token="MIGRATION_JAR" value="${migration-lib.jar}"/>
<filter token="UNBOUNDID_JAR" value="${unboundid.jar}"/>
@@ -3402,6 +3404,15 @@ asf.ldap.username=${release.asfusername}
<param name="checksum.value" value="${objenesis.checksum.value}"/>
</antcall>
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${bytebuddy.loc}"/>
+ <param name="destfile" value="${bytebuddy.jar}"/>
+ <param name="destdir" value="${bytebuddy.home}"/>
+ <param name="checksum.enabled" value="${bytebuddy.checksum.enabled}"/>
+ <param name="checksum.algorithm"
value="${bytebuddy.checksum.algorithm}"/>
+ <param name="checksum.value" value="${bytebuddy.checksum.value}"/>
+ </antcall>
+
<antcall target="downloadfile">
<param name="sourcefile" value="${unboundid.loc}"/>
<param name="destfile" value="${unboundid.jar}"/>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a149bfc292..9895386ed5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -204,6 +204,10 @@
Remove cglib dependency as it is not required by the verion of EasyMock
used by the unit tests. (markt)
</update>
+ <update>
+ Update EasyMock to 5.3.0. This adds a test dependency on Byte-Buddy
+ 1.14.17. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
