This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 7a82963 Add Derby for the testsuite
7a82963 is described below
commit 7a82963a78a8242b3c8c276de2382594f8a74f42
Author: remm <[email protected]>
AuthorDate: Tue Aug 31 21:32:10 2021 +0200
Add Derby for the testsuite
It can be used for JDBC testing. Also for DataSource with our pools.
---
build.properties.default | 24 ++++++++++++++++++++++++
build.xml | 30 ++++++++++++++++++++++++++++++
webapps/docs/changelog.xml | 4 ++++
3 files changed, 58 insertions(+)
diff --git a/build.properties.default b/build.properties.default
index 4032660..53fe36e 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -331,3 +331,27 @@
jsign.checksum.value=50982facf864df4f08a051b43f7d2e42|3d203fbffdc45e837f98b7c9c5
jsign.home=${base.path}/jsign-${jsign.version}
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
+
+# checksums for Derby 10.15.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-tools.checksum.enabled=true
+derby-tools.checksum.algorithm=MD5|SHA-1
+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 330bcd7..2459234 100644
--- a/build.xml
+++ b/build.xml
@@ -234,6 +234,9 @@
<pathelement location="${cglib.jar}"/>
<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" />
</path>
@@ -3230,6 +3233,33 @@ skip.installer property in build.properties" />
<param name="checksum.value" value="${unboundid.checksum.value}"/>
</antcall>
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${derby.loc}"/>
+ <param name="destfile" value="${derby.jar}"/>
+ <param name="destdir" value="${derby.home}"/>
+ <param name="checksum.enabled" value="${derby.checksum.enabled}"/>
+ <param name="checksum.algorithm" value="${derby.checksum.algorithm}"/>
+ <param name="checksum.value" value="${derby.checksum.value}"/>
+ </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}"/>
+ <param name="checksum.enabled" value="${derby-tools.checksum.enabled}"/>
+ <param name="checksum.algorithm"
value="${derby-tools.checksum.algorithm}"/>
+ <param name="checksum.value" value="${derby-tools.checksum.value}"/>
+ </antcall>
+
</target>
<target name="download-cobertura"
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index aeb311b..c6f55aa 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -217,6 +217,10 @@
Update to JSign version 4.0 to enable code signing without the need for
the installation of additional client tools. (markt)
</update>
+ <update>
+ Add Apache Derby 10.15.2.0 to the testsuite dependencies, for JDBC
+ and DataSource testing. (remm)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
