This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new b644116a36 TOMEE-3936 TOMEE-3937 TOMEE-3938 Implement Activation and
Mail specs in Geronimo and integrate them
new 40292f1c4e Merge branch 'master' of github.com:apache/tomee into master
b644116a36 is described below
commit b644116a3626747eaa58926f5208228ec736e60f
Author: Jean-Louis Monteiro <[email protected]>
AuthorDate: Thu May 5 13:47:22 2022 +0200
TOMEE-3936 TOMEE-3937 TOMEE-3938 Implement Activation and Mail specs in
Geronimo and integrate them
---
assembly/openejb-standalone/pom.xml | 5 ++--
boms/tomee-microprofile-api/pom.xml | 17 ++---------
boms/tomee-microprofile/pom.xml | 28 +++++++++---------
boms/tomee-plume-api/pom.xml | 17 ++---------
boms/tomee-plume/pom.xml | 28 +++++++++---------
boms/tomee-plus-api/pom.xml | 17 ++---------
boms/tomee-plus/pom.xml | 28 +++++++++---------
boms/tomee-webprofile-api/pom.xml | 17 ++---------
boms/tomee-webprofile/pom.xml | 28 +++++++++---------
container/openejb-core/pom.xml | 14 ++-------
examples/javamail-velocity/pom.xml | 6 ++--
examples/javamail/pom.xml | 7 ++---
pom.xml | 33 ++++++----------------
server/openejb-client/pom.xml | 10 ++-----
.../tomee-microprofile-webapp/pom.xml | 4 +--
tomee/tomee-plume-webapp/pom.xml | 4 +--
tomee/tomee-plus-webapp/pom.xml | 4 +--
tomee/tomee-webapp/pom.xml | 4 +--
18 files changed, 97 insertions(+), 174 deletions(-)
diff --git a/assembly/openejb-standalone/pom.xml
b/assembly/openejb-standalone/pom.xml
index b4f716986c..c4c9682b78 100644
--- a/assembly/openejb-standalone/pom.xml
+++ b/assembly/openejb-standalone/pom.xml
@@ -127,8 +127,9 @@
<artifactId>jakartaee-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.6_mail</artifactId>
+ <groupId>org.apache.geronimo.mail</groupId>
+ <artifactId>geronimo-mail_2.1_provider</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/boms/tomee-microprofile-api/pom.xml
b/boms/tomee-microprofile-api/pom.xml
index f3e1ea1c6a..ab57ba2f6d 100644
--- a/boms/tomee-microprofile-api/pom.xml
+++ b/boms/tomee-microprofile-api/pom.xml
@@ -73,17 +73,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
@@ -118,9 +107,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.6_mail</artifactId>
- <version>1.0.1</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-mail_2.1_spec</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 1e6c4d2f4d..9af3a215e2 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -452,17 +452,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
@@ -588,9 +577,20 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.6_mail</artifactId>
- <version>1.0.1</version>
+ <groupId>org.apache.geronimo.mail</groupId>
+ <artifactId>geronimo-mail_2.1_provider</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-mail_2.1_spec</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plume-api/pom.xml b/boms/tomee-plume-api/pom.xml
index 9767805152..a40c462cd9 100644
--- a/boms/tomee-plume-api/pom.xml
+++ b/boms/tomee-plume-api/pom.xml
@@ -73,17 +73,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>jakarta.xml.soap</groupId>
<artifactId>jakarta.xml.soap-api</artifactId>
@@ -96,9 +85,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.6_mail</artifactId>
- <version>1.0.1</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-mail_2.1_spec</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index c4b019174a..cbfe48e1d1 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -463,17 +463,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>jakarta.xml.soap</groupId>
<artifactId>jakarta.xml.soap-api</artifactId>
@@ -644,9 +633,20 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.6_mail</artifactId>
- <version>1.0.1</version>
+ <groupId>org.apache.geronimo.mail</groupId>
+ <artifactId>geronimo-mail_2.1_provider</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-mail_2.1_spec</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plus-api/pom.xml b/boms/tomee-plus-api/pom.xml
index 09479727eb..f80fbb5e61 100644
--- a/boms/tomee-plus-api/pom.xml
+++ b/boms/tomee-plus-api/pom.xml
@@ -62,17 +62,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>jakarta.xml.soap</groupId>
<artifactId>jakarta.xml.soap-api</artifactId>
@@ -85,9 +74,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.6_mail</artifactId>
- <version>1.0.1</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-mail_2.1_spec</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 000492f6f8..85e3f3875b 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -463,17 +463,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>jakarta.xml.soap</groupId>
<artifactId>jakarta.xml.soap-api</artifactId>
@@ -644,9 +633,20 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.6_mail</artifactId>
- <version>1.0.1</version>
+ <groupId>org.apache.geronimo.mail</groupId>
+ <artifactId>geronimo-mail_2.1_provider</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-mail_2.1_spec</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-webprofile-api/pom.xml
b/boms/tomee-webprofile-api/pom.xml
index 6d91ed4214..6e911e5d6b 100644
--- a/boms/tomee-webprofile-api/pom.xml
+++ b/boms/tomee-webprofile-api/pom.xml
@@ -52,20 +52,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.6_mail</artifactId>
- <version>1.0.1</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-mail_2.1_spec</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index 0e6c521eee..8dd05629b2 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -166,17 +166,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>net.sourceforge.serp</groupId>
<artifactId>serp</artifactId>
@@ -247,9 +236,20 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.6_mail</artifactId>
- <version>1.0.1</version>
+ <groupId>org.apache.geronimo.mail</groupId>
+ <artifactId>geronimo-mail_2.1_provider</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-mail_2.1_spec</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 817ea1b26a..946a26349e 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -558,20 +558,10 @@
<artifactId>jackson-databind</artifactId>
<optional>true</optional>
</dependency>
- <!-- JavaMail -->
-
- <!-- todo hack: until we move geronimo mail to the jakarta namespace -->
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.0.1</version>
- </dependency>
-
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.6_mail</artifactId>
+ <groupId>org.apache.geronimo.mail</groupId>
+ <artifactId>geronimo-mail_2.1_provider</artifactId>
</dependency>
- <!-- End: JavaMail -->
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm9-shaded</artifactId>
diff --git a/examples/javamail-velocity/pom.xml
b/examples/javamail-velocity/pom.xml
index 845f64b486..db813172ea 100644
--- a/examples/javamail-velocity/pom.xml
+++ b/examples/javamail-velocity/pom.xml
@@ -106,9 +106,9 @@
<!-- todo hack: until we move geronimo mail to the jakarta namespace -->
<dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.0.1</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-mail_2.1_spec</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/examples/javamail/pom.xml b/examples/javamail/pom.xml
index 2578bef040..747b589f43 100644
--- a/examples/javamail/pom.xml
+++ b/examples/javamail/pom.xml
@@ -55,11 +55,10 @@
<scope>provided</scope>
</dependency>
- <!-- todo hack: until we move geronimo mail to the jakarta namespace -->
<dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.0.1</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-mail_2.1_spec</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml
index 24016c87ca..08dbf9116a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,13 +103,12 @@
<version.tomee-patch-plugin>0.9-SNAPSHOT</version.tomee-patch-plugin>
<!--
- Activation and JavaMail are both API and IMPL so we don't have them in
the jakartaee-api uber jar.
+ JavaMail is both API and IMPL so we don't have them in the jakartaee-api
uber jar.
We decided to add them here in the project so we can patch/update the 2
libraries without having
to update and release the jakartaee-api.jar. Different lifecycle.
-->
-
<geronimo-activation_1.1_spec.version>1.1</geronimo-activation_1.1_spec.version>
-
<geronimo-javamail_1.6_spec.version>1.0.1</geronimo-javamail_1.6_spec.version>
-
<geronimo-javamail_1.6_mail.version>1.0.1</geronimo-javamail_1.6_mail.version>
+
<geronimo-mail_2.1_spec.version>1.0.0-SNAPSHOT</geronimo-mail_2.1_spec.version>
+
<geronimo-mail_2.1_provider.version>1.0.0-SNAPSHOT</geronimo-mail_2.1_provider.version>
<openjpa.version>3.2.2</openjpa.version>
<openwebbeans.version>2.0.27-SNAPSHOT</openwebbeans.version>
@@ -1342,31 +1341,15 @@
<artifactId>howl</artifactId>
<version>1.0.1-1</version>
</dependency>
- <!-- todo hack: until we move geronimo mail to the jakarta namespace -->
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.0.1</version>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.6_spec</artifactId>
- <version>${geronimo-javamail_1.6_spec.version}</version>
+ <artifactId>geronimo-mail_2.1_spec</artifactId>
+ <version>${geronimo-mail_2.1_spec.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.6_mail</artifactId>
- <version>${geronimo-javamail_1.6_mail.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.6_provider</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.geronimo.mail</groupId>
+ <artifactId>geronimo-mail_2.1_provider</artifactId>
+ <version>${geronimo-mail_2.1_provider.version}</version>
</dependency>
<dependency>
<groupId>stax</groupId>
diff --git a/server/openejb-client/pom.xml b/server/openejb-client/pom.xml
index 7b37940a60..1e0d354f9d 100644
--- a/server/openejb-client/pom.xml
+++ b/server/openejb-client/pom.xml
@@ -128,15 +128,9 @@
<artifactId>jakartaee-api</artifactId>
</dependency>
- <!-- todo hack: until we move geronimo mail to the jakarta namespace -->
<dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.6_mail</artifactId>
+ <groupId>org.apache.geronimo.mail</groupId>
+ <artifactId>geronimo-mail_2.1_provider</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomee.bom</groupId>
diff --git a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
index efe285c816..2d5d9ace44 100644
--- a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
@@ -289,8 +289,8 @@
</exclusions>
</dependency><!-- MicroProfile -->
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.6_mail</artifactId>
+ <groupId>org.apache.geronimo.mail</groupId>
+ <artifactId>geronimo-mail_2.1_provider</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index 9423945dc2..fedcc20334 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -389,8 +389,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.6_mail</artifactId>
+ <groupId>org.apache.geronimo.mail</groupId>
+ <artifactId>geronimo-mail_2.1_provider</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 052cac4130..ad0ede7f0e 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -389,8 +389,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.6_mail</artifactId>
+ <groupId>org.apache.geronimo.mail</groupId>
+ <artifactId>geronimo-mail_2.1_provider</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml
index bdbae1ec68..fbeee8c211 100644
--- a/tomee/tomee-webapp/pom.xml
+++ b/tomee/tomee-webapp/pom.xml
@@ -406,8 +406,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.6_mail</artifactId>
+ <groupId>org.apache.geronimo.mail</groupId>
+ <artifactId>geronimo-mail_2.1_provider</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
