[tomee-tck] branch tomee-10-with-ee-91 updated: Upgrade Johnzon to be in line with TomEE 10 / main Ports derby-related fixes from jakartaee91 branch

[rzo1]

This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch tomee-10-with-ee-91
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git


The following commit(s) were added to refs/heads/tomee-10-with-ee-91 by this 
push:
     new b3b8908  Upgrade Johnzon to be in line with TomEE 10 / main Ports 
derby-related fixes from jakartaee91 branch
b3b8908 is described below

commit b3b890869c499a7263e33a9ab548a09c59ec0695
Author: Richard Zowalla <richard.zowa...@hs-heilbronn.de>
AuthorDate: Wed Aug 16 08:48:23 2023 +0200

    Upgrade Johnzon to be in line with TomEE 10 / main
    Ports derby-related fixes from jakartaee91 branch
---
 pom.xml                                            | 27 ++++++++++++++++++----
 .../openejb/tck/commands/CommandSupport.groovy     |  6 +++++
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 87187ca..7ce4631 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,8 +52,8 @@
 
     <tomcat.version>10.0.27</tomcat.version>
 
-    <johnzon.version>1.2.19</johnzon.version>
-    <derby.version>10.14.2.0</derby.version>
+    <johnzon.version>1.2.21</johnzon.version>
+    <derby.version>10.15.2.0</derby.version>
 
     <!--
     NOTE: User must define "javaee8.cts.home" and "javaee8.ri.home" in 
~/.m2/settings.xml
@@ -96,7 +96,7 @@
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <version.maven-dependency-plugin>2.9</version.maven-dependency-plugin>
-    <version.activemq>5.16.5</version.activemq>
+    <version.activemq>5.18.1</version.activemq>
     <version.gmaven-plugin>1.5</version.gmaven-plugin>
   </properties>
 
@@ -303,6 +303,18 @@
       <version>${derby.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <version>${derby.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbyshared</artifactId>
+      <version>${derby.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derbynet</artifactId>
@@ -617,6 +629,11 @@
                 <artifactId>derbyclient</artifactId>
                 <version>${derby.version}</version>
               </dependency>
+              <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derbytools</artifactId>
+                <version>${derby.version}</version>
+              </dependency>
             </dependencies>
 
             <executions>
@@ -861,7 +878,7 @@
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
               <excludeTransitive>true</excludeTransitive>
-              
<includeArtifactIds>hawtbuf,geronimo-jms_1.1_spec,activemq-client,tsharness,tssv,cts,whitebox,dbprocedures,geronimo-mail,derby,derbynet,derbyclient</includeArtifactIds>
+              
<includeArtifactIds>hawtbuf,geronimo-jms_1.1_spec,activemq-client,tsharness,tssv,cts,whitebox,dbprocedures,geronimo-mail,derby,derbyclient,derbynet,derbyshared,derbytools</includeArtifactIds>
             </configuration>
           </execution>
 
@@ -877,7 +894,7 @@
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
               <excludeTransitive>true</excludeTransitive>
-              
<includeArtifactIds>tsharness,tssv,cts,whitebox,dbprocedures,geronimo-mail,openejb-derbynet,derby,derbynet,derbyclient</includeArtifactIds>
+              
<includeArtifactIds>tsharness,tssv,cts,whitebox,dbprocedures,geronimo-mail,openejb-derbynet,derby,derbyclient,derbynet,derbyshared,derbytools</includeArtifactIds>
             </configuration>
           </execution>
         </executions>
diff --git a/src/test/script/openejb/tck/commands/CommandSupport.groovy 
b/src/test/script/openejb/tck/commands/CommandSupport.groovy
index 588a746..33c18cf 100644
--- a/src/test/script/openejb/tck/commands/CommandSupport.groovy
+++ b/src/test/script/openejb/tck/commands/CommandSupport.groovy
@@ -234,6 +234,9 @@ abstract class CommandSupport {
 //        builder.append("hsqldb-*.jar")
         builder.append("derby-*.jar")
         builder.append("derbyclient-*.jar")
+        builder.append("derbynet-*.jar")
+        builder.append("derbyshared-*.jar")
+        builder.append("derbytools-*.jar")
         builder.append("openejb-client*.jar")
         builder.directory = "${javaeetckHome}/lib"
         builder.append("javatest.jar")
@@ -303,6 +306,9 @@ abstract class CommandSupport {
         builder.directory = openejbLib
         builder.append("derby-*.jar")
         builder.append("derbyclient-*.jar")
+        builder.append("derbynet-*.jar")
+        builder.append("derbyshared-*.jar")
+        builder.append("derbytools-*.jar")
         if (get("webcontainer").equals("tomee-plume")) {
             builder.appendAll("eclipselink-*.jar")
         }