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 1e2bc51739e495a553951fc8d4f55f9e3662ed14 Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> AuthorDate: Tue Jun 9 13:34:37 2020 +0300 Update some more occurrences of hamcrest-core-1.3 to hamcrest-2.2 (cherry picked from commit 01e46e0b5e33a0de091f13912418aec3976faa5d) --- build.properties.default | 2 +- modules/jdbc-pool/build.properties.default | 6 +++--- res/ide-support/eclipse/eclipse.classpath | 2 +- res/ide-support/netbeans/nb-tomcat-build.properties | 2 +- res/ide-support/netbeans/project.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.properties.default b/build.properties.default index e3f62c3..7b07ffe 100644 --- a/build.properties.default +++ b/build.properties.default @@ -222,7 +222,7 @@ hamcrest.checksum.enabled=true hamcrest.checksum.algorithm=SHA-512 hamcrest.checksum.value=6b1141329b83224f69f074cb913dbff6921d6b8693ede8d2599acb626481255dae63de42eb123cbd5f59a261ac32faae012be64e8e90406ae9215543fbca5546 hamcrest.home=${base.path}/hamcrest-${hamcrest.version} -hamcrest.jar=${hamcrest.home}/hamcrest-core-${hamcrest.version}.jar +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 ----- diff --git a/modules/jdbc-pool/build.properties.default b/modules/jdbc-pool/build.properties.default index 4cfa93fa..2107872 100644 --- a/modules/jdbc-pool/build.properties.default +++ b/modules/jdbc-pool/build.properties.default @@ -71,10 +71,10 @@ junit.jar=${junit.home}/junit-${junit.version}.jar junit.loc=https://repo.maven.apache.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar # Hamcrest Library, used by JUnit -hamcrest.version=1.3 +hamcrest.version=2.2 hamcrest.home=${base.path}/hamcrest-${hamcrest.version} -hamcrest.jar=${hamcrest.home}/hamcrest-core-${hamcrest.version}.jar -hamcrest.loc=https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar +hamcrest.jar=${hamcrest.home}/hamcrest-${hamcrest.version}.jar +hamcrest.loc=https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/${hamcrest.version}/hamcrest-${hamcrest.version}.jar mysql.home=${base.path}/mysql-connector-java-5.1.12 mysql.jar=${mysql.home}/mysql-connector-java-5.1.12-bin.jar diff --git a/res/ide-support/eclipse/eclipse.classpath b/res/ide-support/eclipse/eclipse.classpath index 2214880..b20401d 100644 --- a/res/ide-support/eclipse/eclipse.classpath +++ b/res/ide-support/eclipse/eclipse.classpath @@ -26,7 +26,7 @@ <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/hamcrest-1.3/hamcrest-core-1.3.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="output" path=".settings/output"/> diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties b/res/ide-support/netbeans/nb-tomcat-build.properties index 336306a..2306f37 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-1.3/hamcrest-core-1.3.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-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} # 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 f4c25ee..f113d6f 100644 --- a/res/ide-support/netbeans/project.xml +++ b/res/ide-support/netbeans/project.xml @@ -189,9 +189,9 @@ <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-1.3/hamcrest-core-1.3.jar</classpath> + <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> <source-level>1.7</source-level> </compilation-unit> </java-data> </configuration> -</project> \ No newline at end of file +</project> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org