This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new a4f1d05 Align Derby version used with 10.1.x and 10.0.x
a4f1d05 is described below
commit a4f1d05ee6606e515a75b69e33fbbe7b77284560
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 18 09:49:39 2022 +0000
Align Derby version used with 10.1.x and 10.0.x
---
build.properties.default | 13 +++++++++----
build.xml | 12 +++++++++++-
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 342a70e..f27dea5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -331,19 +331,24 @@ 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.14.2.0
+derby.version=10.15.2.0
-# checksums for Derby 10.14.2.0
+# checksums for Derby 10.15.2.0
derby.checksum.enabled=true
derby.checksum.algorithm=MD5|SHA-1
-derby.checksum.value=3ddcc1d435344d39d0122dbc2f39a746|7efad40ef52fbb1f08142f07a83b42d29e47d8ce
+derby.checksum.value=abff01351b19bc62a188bac08a8bb58b|b64da6681994f33ba5783ffae55cdb44885b9e70
+derby-shared.checksum.enabled=true
+derby-shared.checksum.algorithm=MD5|SHA-1
+derby-shared.checksum.value=2cb9ab8b9cfb06c2da5a1d3825d04344|ff2dfb3e2a92d593cf111baad242d156947abbc1
derby-tools.checksum.enabled=true
derby-tools.checksum.algorithm=MD5|SHA-1
-derby-tools.checksum.value=3189a1d586f98f0d203fb5f3e5d88fbe|338d5a54b4089c80414fe0ecb3899d521da69b26
+derby-tools.checksum.value=d41578eeb336b0e479be8f30bfd9ab9b|d63722381e0e893d797e4d531e219e2917898364
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 6ee78f6..b712c80 100644
--- a/build.xml
+++ b/build.xml
@@ -101,7 +101,7 @@
<!-- build output directory for generated reflectionless code -->
<property name="tomcat.xreflect" value="${tomcat.output}/xreflect"/>
- <!-- Servlet 4.0 spec requires Java 8+ -->
+ <!-- Java EE 8 platform requires Java 8+ -->
<property name="compile.release" value="8"/>
<property name="min.java.version" value="8"/>
<property name="build.java.version" value="11"/>
@@ -234,6 +234,7 @@
<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" />
@@ -3141,6 +3142,15 @@ 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}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
