Mark,
\O/
|
-chris
On 6/26/24 11:45, ma...@apache.org wrote:
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 449226d587 Remove cglib dependency
449226d587 is described below
commit 449226d5874757f29663c177b3815bc6c240b089
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 26 16:44:54 2024 +0100
Remove cglib dependency
---
build.properties.default | 13 ++-----------
build.xml | 11 -----------
res/ide-support/eclipse/eclipse.classpath | 1 -
res/ide-support/idea/tomcat.iml | 9 ---------
res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml | 2 +-
webapps/docs/changelog.xml | 4 ++++
7 files changed, 8 insertions(+), 34 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 0484c69fe6..01e7dc000b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -216,7 +216,7 @@ 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 3.2 or later -----
+# ----- EasyMock, version 4.0 or later -----
easymock.version=4.3
easymock.checksum.enabled=true
easymock.checksum.algorithm=MD5|SHA-1
@@ -225,16 +225,7 @@ 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
-# ----- cglib, used by EasyMock, version 2.2 or later -----
-cglib.version=3.3.0
-cglib.checksum.enabled=true
-cglib.checksum.algorithm=SHA-512
-cglib.checksum.value=faa1d2121e87ae69e179e3aae217accd0834e0da716b91a029fd526e192612e71675f2740bedf48e23ef1edc45f672a2be1b3e78bbfb1ad59c96dd3d2feeedba
-cglib.home=${base.path}/cglib-${cglib.version}
-cglib.jar=${cglib.home}/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, used by EasyMock, version 3.0.1 or later -----
objenesis.version=3.4
objenesis.checksum.enabled=true
objenesis.checksum.algorithm=MD5|SHA-1
diff --git a/build.xml b/build.xml
index b1fe152e54..214ccb2cfd 100644
--- a/build.xml
+++ b/build.xml
@@ -247,7 +247,6 @@
<pathelement location="${junit.jar}"/>
<pathelement location="${hamcrest.jar}"/>
<pathelement location="${easymock.jar}"/>
- <pathelement location="${cglib.jar}"/>
<pathelement location="${objenesis.jar}"/>
<pathelement location="${unboundid.jar}"/>
<pathelement location="${derby.jar}"/>
@@ -263,7 +262,6 @@
<filter token="JDT_JAR" value="${jdt.jar}"/>
<filter token="EASYMOCK_JAR" value="${easymock.jar}"/>
<filter token="HAMCREST_JAR" value="${hamcrest.jar}"/>
- <filter token="CGLIB_JAR" value="${cglib.jar}"/>
<filter token="OBJENESIS_JAR" value="${objenesis.jar}"/>
<filter token="BND_JAR" value="${bnd.jar}"/>
<filter token="MIGRATION_JAR" value="${migration-lib.jar}"/>
@@ -3395,15 +3393,6 @@ asf.ldap.username=${release.asfusername}
<param name="checksum.value" value="${easymock.checksum.value}"/>
</antcall>
- <antcall target="downloadfile">
- <param name="sourcefile" value="${cglib.loc}"/>
- <param name="destfile" value="${cglib.jar}"/>
- <param name="destdir" value="${cglib.home}"/>
- <param name="checksum.enabled" value="${cglib.checksum.enabled}"/>
- <param name="checksum.algorithm" value="${cglib.checksum.algorithm}"/>
- <param name="checksum.value" value="${cglib.checksum.value}"/>
- </antcall>
-
<antcall target="downloadfile">
<param name="sourcefile" value="${objenesis.loc}"/>
<param name="destfile" value="${objenesis.jar}"/>
diff --git a/res/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index 06cb31a56c..74456da20c 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -33,7 +33,6 @@
<classpathentry kind="lib" path="@JDT_JAR@"/>
<classpathentry kind="lib" path="@EASYMOCK_JAR@"/>
<classpathentry kind="lib" path="@HAMCREST_JAR@"/>
- <classpathentry kind="lib" path="@CGLIB_JAR@"/>
<classpathentry kind="lib" path="@OBJENESIS_JAR@"/>
<classpathentry kind="lib" path="@BND_JAR@"/>
<classpathentry kind="lib" path="@MIGRATION_JAR@"/>
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 95b36c35b1..5fc18897e4 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -81,15 +81,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://@CGLIB_JAR@!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties
b/res/ide-support/netbeans/nb-tomcat-build.properties
index 165bc2c1e4..dd4aac3c40 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:@JUNIT_JAR@:@EASYMOCK_JAR@:@OBJENESIS_JAR@:@CGLIB_JAR@:@HAMCREST_JAR@:@ECJ_JAR@:@UNBOUNDID_JAR@:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:@JUNIT_JAR@:@EASYMOCK_JAR@:@OBJENESIS_JAR@:@HAMCREST_JAR@:@ECJ_JAR@:@UNBOUNDID_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 37a55e20ed..71a1c1a84b 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:output/build/webapps/examples/WEB-INF/classes:@JUNIT_JAR@:@EASYMOCK_JAR@:@OBJENESIS_JAR@:@CGLIB_JAR@:@HAMCREST_JAR@:@UNBOUNDID_JAR@</classpath>
+ <classpath
mode="compile">output/classes:output/testclasses:output/build/webapps/examples/WEB-INF/classes:@JUNIT_JAR@:@EASYMOCK_JAR@:@OBJENESIS_JAR@:@HAMCREST_JAR@:@UNBOUNDID_JAR@</classpath>
<source-level>@BUILD_JAVA_VERSION@</source-level>
</compilation-unit>
</java-data>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1d0f3912d5..a149bfc292 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -200,6 +200,10 @@
<update>
Update to SpotBugs 4.8.6. (markt)
</update>
+ <update>
+ Remove cglib dependency as it is not required by the verion of EasyMock
+ used by the unit tests. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
