[tomee-tck] branch tomee-9.x updated: fix backport from old branch

[jlmonteiro]

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

jlmonteiro pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git


The following commit(s) were added to refs/heads/tomee-9.x by this push:
     new 4a88d96  fix backport from old branch
4a88d96 is described below

commit 4a88d96391d952b479218cf1bd0d12c610648978
Author: Jean-Louis Monteiro <jlmonte...@tomitribe.com>
AuthorDate: Tue May 23 00:48:01 2023 +0200

    fix backport from old branch
---
 pom.xml                                                   | 15 +++++++++++++--
 .../script/openejb/tck/commands/CommandSupport.groovy     |  8 ++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6259952..f8e5a6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -309,6 +309,12 @@
       <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>
@@ -623,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>
@@ -867,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>
 
@@ -883,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 20d43fa..33c18cf 100644
--- a/src/test/script/openejb/tck/commands/CommandSupport.groovy
+++ b/src/test/script/openejb/tck/commands/CommandSupport.groovy
@@ -233,8 +233,10 @@ abstract class CommandSupport {
 
 //        builder.append("hsqldb-*.jar")
         builder.append("derby-*.jar")
-        builder.append("derbytools-*.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,8 +305,10 @@ abstract class CommandSupport {
         builder.append("jaxb-xjc.jar")
         builder.directory = openejbLib
         builder.append("derby-*.jar")
-        builder.append("derbytools-*.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")
         }