You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mg...@apache.org on 2020/06/09 19:41:52 UTC
[tomcat] branch 8.5.x updated (4eee340 -> 5c5f553)
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 4eee340 Add release date for 8.5.56
new 4edb2cf Update Hamcrest to 2.2
new 1e2bc51 Update some more occurrences of hamcrest-core-1.3 to hamcrest-2.2
new 78fae4d Update Easymock to 4.2
new 8c4fcb9 Update cglib to 3.3.0 and objenesis to 3.1
new 5c5f553 Update the checksum of cglib and objenesis
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.properties.default | 28 +++++++++++-----------
modules/jdbc-pool/build.properties.default | 6 ++---
res/ide-support/eclipse/eclipse.classpath | 8 +++----
res/ide-support/idea/tomcat.iml | 22 ++++++++---------
.../netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml | 4 ++--
6 files changed, 34 insertions(+), 36 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/05: Update Easymock to 4.2
Posted by mg...@apache.org.
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 <mg...@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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 05/05: Update the checksum of cglib and objenesis
Posted by mg...@apache.org.
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 5c5f553128cd7845ec33dddcb3bbb0d08642f683
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Tue Jun 9 17:05:56 2020 +0300
Update the checksum of cglib and objenesis
I've forgot to copy those from my build.properties to build.properties.default
(cherry picked from commit bf5d2bec3fbd25a858333530f3bb9bffb4e7c00a)
---
build.properties.default | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index e6633fb..331556c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -237,8 +237,8 @@ easymock.loc=${base-maven.loc}/org/easymock/easymock/${easymock.version}/easymoc
# ----- cglib, used by EasyMock, version 2.2 or later -----
cglib.version=3.3.0
cglib.checksum.enabled=true
-cglib.checksum.algorithm=MD5|SHA-1
-cglib.checksum.value=af93e373d7ddf35db0e9612480d9ed13|00d456bb230c70c0b95c76fb28e429d42f275941
+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
@@ -246,8 +246,8 @@ cglib.loc=${base-maven.loc}/cglib/cglib-nodep/${cglib.version}/cglib-nodep-${cgl
# ----- objenesis, used by EasyMock, version 1.2 or later -----
objenesis.version=3.1
objenesis.checksum.enabled=true
-objenesis.checksum.algorithm=MD5|SHA-1
-objenesis.checksum.value=bee117291d50b41b8e8cf0ac5435df1d|bfcb0539a071a4c5a30690388903ac48c0667f2a
+objenesis.checksum.algorithm=SHA-512
+objenesis.checksum.value=4dcfc065d6ccc1e0cb716fc86d844e81a347591d06f99b1840157c51c58a842bdebe86f6bcacee65996b64468d21bdf3bcf463a7f4ae5261440c8f0f6fac8ab3
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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/05: Update cglib to 3.3.0 and objenesis to 3.1
Posted by mg...@apache.org.
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 8c4fcb96c67157a528cd5fb3f1952314bc4a3e7e
Author: Martin Tzvetanov Grigorov <mg...@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 fac449a..e6633fb 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -235,7 +235,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
@@ -244,7 +244,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 7e11485..c31e91f 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.6.3/ecj-4.6.3.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 67d416d..5c23065 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 3007a45..97916d8 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.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-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.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 9917745..cb73f73 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/05: Update some more occurrences of hamcrest-core-1.3
to hamcrest-2.2
Posted by mg...@apache.org.
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 <mg...@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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/05: Update Hamcrest to 2.2
Posted by mg...@apache.org.
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 4edb2cf1e10a50040420c537185555993394fa93
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Tue Jun 9 11:33:01 2020 +0300
Update Hamcrest to 2.2
Use hamcrest.jar instead of hamcrest-core.jar
(cherry picked from commit c7ecf029e2de4fbb741dce8a5e6109d8010d0421)
---
build.properties.default | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 65854b7..e3f62c3 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -217,13 +217,13 @@ junit.jar=${junit.home}/junit-${junit.version}.jar
junit.loc=${base-maven.loc}/junit/junit/${junit.version}/junit-${junit.version}.jar
# ----- Hamcrest Library, used by JUnit, version 1.3 or later ----
-hamcrest.version=1.3
+hamcrest.version=2.2
hamcrest.checksum.enabled=true
-hamcrest.checksum.algorithm=MD5|SHA-1
-hamcrest.checksum.value=6393363b47ddcbba82321110c3e07519|42a25dc3219429f0e5d060061f71acb49bf010a0
+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.loc=${base-maven.loc}/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org