This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d7b6adb64462ce3f3b5f4697a88563306ab34754 Author: remm <r...@apache.org> AuthorDate: Wed Sep 1 13:00:49 2021 +0200 Use Derby 10.14 for Java 8 compatibility --- build.properties.default | 13 ++++--------- build.xml | 10 ---------- webapps/docs/changelog.xml | 2 +- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/build.properties.default b/build.properties.default index a5e25b2..0dddea9 100644 --- a/build.properties.default +++ b/build.properties.default @@ -335,24 +335,19 @@ jsign.jar=${jsign.home}/jsign-${jsign.version}.jar jsign.loc=${base-maven.loc}/net/jsign/jsign/${jsign.version}/jsign-${jsign.version}.jar # ----- Derby, used by unit tests ----- -derby.version=10.15.2.0 +derby.version=10.14.2.0 -# checksums for Derby 10.15.2.0 +# checksums for Derby 10.14.2.0 derby.checksum.enabled=true derby.checksum.algorithm=MD5|SHA-1 -derby.checksum.value=abff01351b19bc62a188bac08a8bb58b|b64da6681994f33ba5783ffae55cdb44885b9e70 -derby-shared.checksum.enabled=true -derby-shared.checksum.algorithm=MD5|SHA-1 -derby-shared.checksum.value=2cb9ab8b9cfb06c2da5a1d3825d04344|ff2dfb3e2a92d593cf111baad242d156947abbc1 +derby.checksum.value=3ddcc1d435344d39d0122dbc2f39a746|7efad40ef52fbb1f08142f07a83b42d29e47d8ce derby-tools.checksum.enabled=true derby-tools.checksum.algorithm=MD5|SHA-1 -derby-tools.checksum.value=d41578eeb336b0e479be8f30bfd9ab9b|d63722381e0e893d797e4d531e219e2917898364 +derby-tools.checksum.value=3189a1d586f98f0d203fb5f3e5d88fbe|338d5a54b4089c80414fe0ecb3899d521da69b26 derby.home=${base.path}/derby-${derby.version} derby.jar=${derby.home}/derby-${derby.version}.jar derby.loc=${base-maven.loc}/org/apache/derby/derby/${derby.version}/derby-${derby.version}.jar -derby-shared.jar=${derby.home}/derby-shared-${derby.version}.jar -derby-shared.loc=${base-maven.loc}/org/apache/derby/derbyshared/${derby.version}/derbyshared-${derby.version}.jar derby-tools.jar=${derby.home}/derby-tools-${derby.version}.jar derby-tools.loc=${base-maven.loc}/org/apache/derby/derbytools/${derby.version}/derbytools-${derby.version}.jar diff --git a/build.xml b/build.xml index 172e923..a98f4e1 100644 --- a/build.xml +++ b/build.xml @@ -262,7 +262,6 @@ <pathelement location="${objenesis.jar}"/> <pathelement location="${unboundid.jar}"/> <pathelement location="${derby.jar}"/> - <pathelement location="${derby-shared.jar}"/> <pathelement location="${derby-tools.jar}"/> <path refid="compile.classpath" /> <path refid="tomcat.classpath" /> @@ -3288,15 +3287,6 @@ skip.installer property in build.properties" /> </antcall> <antcall target="downloadfile"> - <param name="sourcefile" value="${derby-shared.loc}"/> - <param name="destfile" value="${derby-shared.jar}"/> - <param name="destdir" value="${derby.home}"/> - <param name="checksum.enabled" value="${derby-shared.checksum.enabled}"/> - <param name="checksum.algorithm" value="${derby-shared.checksum.algorithm}"/> - <param name="checksum.value" value="${derby-shared.checksum.value}"/> - </antcall> - - <antcall target="downloadfile"> <param name="sourcefile" value="${derby-tools.loc}"/> <param name="destfile" value="${derby-tools.jar}"/> <param name="destdir" value="${derby.home}"/> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 6c98caf..1fef3d3 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -200,7 +200,7 @@ the installation of additional client tools. (markt) </update> <update> - Add Apache Derby 10.15.2.0 to the testsuite dependencies, for JDBC + Add Apache Derby 10.14.2.0 to the testsuite dependencies, for JDBC and DataSource testing. (remm) </update> </changelog> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org