This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch jakartaee9-tck
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
The following commit(s) were added to refs/heads/jakartaee9-tck by this push:
new 7b68ecb Use the jakarta compatible version of geronimo-mail Fix SXC
to use our shaded version for jakarta namespace
7b68ecb is described below
commit 7b68ecb1fabdaeb5ec67a5db74e60123894811ae
Author: Jean-Louis Monteiro <[email protected]>
AuthorDate: Thu May 5 21:52:49 2022 +0200
Use the jakarta compatible version of geronimo-mail
Fix SXC to use our shaded version for jakarta namespace
---
pom.xml | 20 ++++++++++----------
.../openejb/tck/commands/CommandSupport.groovy | 5 +++--
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index edd5d8a..83bf333 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,8 @@
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-connector</artifactId>
- <version>3.1.4</version>
+ <version>3.1.5</version>
+ <classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -159,12 +160,12 @@
<dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail-standalone</artifactId>
- <version>1.5.10</version>
+ <version>1.6.9</version>
</dependency>
<dependency>
<groupId>com.unboundid</groupId>
<artifactId>unboundid-ldapsdk</artifactId>
- <version>5.1.0</version>
+ <version>6.0.4</version>
</dependency>
<!--<dependency>-->
@@ -285,9 +286,9 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-mail</artifactId>
- <version>2.0.2</version>
+ <groupId>org.apache.geronimo.mail</groupId>
+ <artifactId>geronimo-mail_2.1_provider</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -917,8 +918,7 @@
<include name="stax-ex*.jar"/>
<include name="FastInfoset*.jar"/>
<include name="openejb-jee-accessors*.jar"/>
- <include name="sxc-jaxb*.jar"/>
- <include name="sxc-runtime*.jar"/>
+ <include name="sxc-shade*.jar"/>
<include name="commons-cli*.jar"/>
<include name="commons-collections*.jar"/>
<include name="activemq-jdbc*.jar"/>
@@ -930,7 +930,6 @@
<include name="jackson-annotations*.jar"/>
<include name="jackson-core*.jar"/>
<include name="johnzon*.jar"/>
- <include name="geronimo-javamail*.jar"/>
<include name="xbean-asm*.jar"/>
<include name="xbean-finder*.jar"/>
<include name="xbean-reflect*.jar"/>
@@ -973,7 +972,8 @@
<include name="tomee-security*.jar"/>
<include name="tomee-catalina*.jar"/>
- <include name="geronimo-mail-*.jar"/>
+ <include name="geronimo-mail_2.1_spec*.jar"/>
+ <include name="geronimo-mail_2.1_provider*.jar"/>
<include name="eclipselink*.jar"/>
diff --git a/src/test/script/openejb/tck/commands/CommandSupport.groovy
b/src/test/script/openejb/tck/commands/CommandSupport.groovy
index 97f7eee..bd98ed7 100644
--- a/src/test/script/openejb/tck/commands/CommandSupport.groovy
+++ b/src/test/script/openejb/tck/commands/CommandSupport.groovy
@@ -198,8 +198,9 @@ abstract class CommandSupport {
builder = new PathBuilder(this)
builder.directory = openejbLib
builder.append("el-api.jar")
- builder.append("jakarta.mail*.jar")
- builder.append("jakarta.activation-*.jar")
+ builder.append("geronimo-mail_2.1_spec*.jar")
+ builder.append("geronimo-mail_2.1_provider*.jar")
+ // builder.append("jakarta.activation-*.jar")
builder.append("jakartaee-api-*.jar")
// only for plume
