This is an automated email from the ASF dual-hosted git repository. mgrigorov pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit bc0853bc2e1613e55e53e6ca3b5da16ad36144cc Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> AuthorDate: Tue Jun 9 16:17:01 2020 +0300 Update cglib to 3.3.0 and objenesis to 3.1 (cherry picked from commit eb8b48da4fd1575148135eb4be421c0faca6e4c3) --- build.properties.default | 4 ++-- res/ide-support/eclipse/eclipse.classpath | 4 ++-- res/ide-support/idea/tomcat.iml | 4 ++-- res/ide-support/netbeans/nb-tomcat-build.properties | 2 +- res/ide-support/netbeans/project.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.properties.default b/build.properties.default index b6d671d..8682346 100644 --- a/build.properties.default +++ b/build.properties.default @@ -231,7 +231,7 @@ 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=2.2.2 +cglib.version=3.3.0 cglib.checksum.enabled=true cglib.checksum.algorithm=MD5|SHA-1 cglib.checksum.value=af93e373d7ddf35db0e9612480d9ed13|00d456bb230c70c0b95c76fb28e429d42f275941 @@ -240,7 +240,7 @@ 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.version=1.2 +objenesis.version=3.1 objenesis.checksum.enabled=true objenesis.checksum.algorithm=MD5|SHA-1 objenesis.checksum.value=bee117291d50b41b8e8cf0ac5435df1d|bfcb0539a071a4c5a30690388903ac48c0667f2a diff --git a/res/ide-support/eclipse/eclipse.classpath b/res/ide-support/eclipse/eclipse.classpath index 6689e9b..897a4b3 100644 --- a/res/ide-support/eclipse/eclipse.classpath +++ b/res/ide-support/eclipse/eclipse.classpath @@ -27,7 +27,7 @@ <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-4.15/ecj-4.15.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"/> + <classpathentry kind="var" path="TOMCAT_LIBS_BASE/cglib-3.3.0/cglib-nodep-2.2.2.jar"/> + <classpathentry kind="var" path="TOMCAT_LIBS_BASE/objenesis-3.1/objenesis-1.2.jar"/> <classpathentry kind="output" path=".settings/output"/> </classpath> diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml index 227c177..7d3e246 100644 --- a/res/ide-support/idea/tomcat.iml +++ b/res/ide-support/idea/tomcat.iml @@ -95,7 +95,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$TOMCAT_BUILD_LIBS$/cglib-2.2.2/cglib-nodep-2.2.2.jar!/" /> + <root url="jar://$TOMCAT_BUILD_LIBS$/cglib-3.3.0/cglib-nodep-3.3.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -104,7 +104,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$TOMCAT_BUILD_LIBS$/objenesis-1.2/objenesis-1.2.jar!/" /> + <root url="jar://$TOMCAT_BUILD_LIBS$/objenesis-3.1/objenesis-3.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties b/res/ide-support/netbeans/nb-tomcat-build.properties index e8f4147..bc3ff92 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-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.15/ecj-4.15.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-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.15/ecj-4.15.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 f4513f0..084b8f5 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-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> + <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-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.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