You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2023/06/12 11:34:33 UTC
[tomee-tck] branch main updated (af6d3ed -> 9b129d8)
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
from af6d3ed Initial Setup for Jakarta EE 10 Platform/WebProfile
new 6327030 Aligns version used in 10.0.0-SNAPSHOT - Johnzon to 1.2.20 - Derby to 10.15.2.0 - AMQ to 5.18.1
new ce17633 Fix derby version
new 9b129d8 fix backport from old branch
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 29 +++++++++++++++++-----
.../openejb/tck/commands/CommandSupport.groovy | 6 +++++
2 files changed, 29 insertions(+), 6 deletions(-)
[tomee-tck] 03/03: fix backport from old branch
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
commit 9b129d803b356aa6c7b13f83a3961e2e011fbeb2
Author: Jean-Louis Monteiro <jl...@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 a5c6e8b..231ee20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -302,6 +302,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>
@@ -616,6 +622,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>
@@ -869,7 +880,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>
@@ -885,7 +896,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")
}
[tomee-tck] 01/03: Aligns version used in 10.0.0-SNAPSHOT - Johnzon to 1.2.20 - Derby to 10.15.2.0 - AMQ to 5.18.1
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
commit 63270305d948cfb503f24efb6d0d017bae3d4c8f
Author: Richard Zowalla <ri...@hs-heilbronn.de>
AuthorDate: Tue May 9 20:04:18 2023 +0200
Aligns version used in 10.0.0-SNAPSHOT
- Johnzon to 1.2.20
- Derby to 10.15.2.0
- AMQ to 5.18.1
---
pom.xml | 14 ++++++++++----
src/test/script/openejb/tck/commands/CommandSupport.groovy | 2 ++
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 30aae00..30767d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>tomee-tck</artifactId>
<name>TomEE TCK Harness</name>
- <version>9.0.0-SNAPSHOT</version>
+ <version>10.0.0-SNAPSHOT</version>
<description>
TomEE TCK Harness
@@ -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.20</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>
@@ -296,6 +296,12 @@
<version>${derby.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${version.derby}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
diff --git a/src/test/script/openejb/tck/commands/CommandSupport.groovy b/src/test/script/openejb/tck/commands/CommandSupport.groovy
index 588a746..20d43fa 100644
--- a/src/test/script/openejb/tck/commands/CommandSupport.groovy
+++ b/src/test/script/openejb/tck/commands/CommandSupport.groovy
@@ -233,6 +233,7 @@ abstract class CommandSupport {
// builder.append("hsqldb-*.jar")
builder.append("derby-*.jar")
+ builder.append("derbytools-*.jar")
builder.append("derbyclient-*.jar")
builder.append("openejb-client*.jar")
builder.directory = "${javaeetckHome}/lib"
@@ -302,6 +303,7 @@ abstract class CommandSupport {
builder.append("jaxb-xjc.jar")
builder.directory = openejbLib
builder.append("derby-*.jar")
+ builder.append("derbytools-*.jar")
builder.append("derbyclient-*.jar")
if (get("webcontainer").equals("tomee-plume")) {
builder.appendAll("eclipselink-*.jar")
[tomee-tck] 02/03: Fix derby version
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
commit ce176332673ada0a577d230a172992b5d3060fbe
Author: Richard Zowalla <ri...@hs-heilbronn.de>
AuthorDate: Mon Jun 12 13:34:07 2023 +0200
Fix derby version
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 30767d1..a5c6e8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -299,7 +299,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
- <version>${version.derby}</version>
+ <version>${derby.version}</version>
</dependency>
<dependency>