You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2019/08/01 12:06:15 UTC
[tomee] branch master updated: TOMEE-2606 Use latest JavaMail 1.5
for TomEE 8
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 ecc62a9 TOMEE-2606 Use latest JavaMail 1.5 for TomEE 8
ecc62a9 is described below
commit ecc62a9520cd3ea8a28b31d2de2ae4a46e42e5af
Author: Jean-Louis Monteiro <je...@gmail.com>
AuthorDate: Thu Aug 1 14:06:00 2019 +0200
TOMEE-2606 Use latest JavaMail 1.5 for TomEE 8
---
.gitignore | 1 +
arquillian/arquillian-tomee-common/pom.xml | 4 ++++
arquillian/arquillian-tomee-webapp-remote/pom.xml | 4 ++++
assembly/openejb-standalone/pom.xml | 2 +-
container/openejb-core/pom.xml | 2 +-
pom.xml | 10 +++++-----
server/openejb-client/pom.xml | 2 +-
server/openejb-cxf-rs/pom.xml | 4 ++++
server/openejb-cxf/pom.xml | 16 ++++++++++++++++
tomee/tomee-webapp/pom.xml | 2 +-
10 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/.gitignore b/.gitignore
index fb7f4ae..3b4bc47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ nb-configuration.xml
.history
**/test/key
tck/**/temp
+examples/jaxrs-json-provider-jettison/temp/
diff --git a/arquillian/arquillian-tomee-common/pom.xml b/arquillian/arquillian-tomee-common/pom.xml
index 5fcbafb..c3b3081 100644
--- a/arquillian/arquillian-tomee-common/pom.xml
+++ b/arquillian/arquillian-tomee-common/pom.xml
@@ -150,6 +150,10 @@
<groupId>org.objectweb.howl</groupId>
</exclusion>
<exclusion>
+ <artifactId>geronimo-javamail_1.5_mail</artifactId>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ </exclusion>
+ <exclusion>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
<groupId>org.apache.geronimo.javamail</groupId>
</exclusion>
diff --git a/arquillian/arquillian-tomee-webapp-remote/pom.xml b/arquillian/arquillian-tomee-webapp-remote/pom.xml
index 38eda24..28e2c6f 100644
--- a/arquillian/arquillian-tomee-webapp-remote/pom.xml
+++ b/arquillian/arquillian-tomee-webapp-remote/pom.xml
@@ -168,6 +168,10 @@
<groupId>org.objectweb.howl</groupId>
</exclusion>
<exclusion>
+ <artifactId>geronimo-javamail_1.5_mail</artifactId>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ </exclusion>
+ <exclusion>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
<groupId>org.apache.geronimo.javamail</groupId>
</exclusion>
diff --git a/assembly/openejb-standalone/pom.xml b/assembly/openejb-standalone/pom.xml
index c04077c..1eb024c 100644
--- a/assembly/openejb-standalone/pom.xml
+++ b/assembly/openejb-standalone/pom.xml
@@ -137,7 +137,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ <artifactId>geronimo-javamail_1.5_mail</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index b0ab010..d93011f 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -554,7 +554,7 @@
<!-- JavaMail -->
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ <artifactId>geronimo-javamail_1.5_mail</artifactId>
</dependency>
<!-- End: JavaMail -->
<dependency>
diff --git a/pom.xml b/pom.xml
index f57c072..09687bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,7 +178,7 @@
<scannotation.version>1.0.2</scannotation.version>
<geronimo.connector.version>3.1.4</geronimo.connector.version>
<geronimo-osgi.version>1.1</geronimo-osgi.version>
- <geronimo-javamail_1.4_spec.version>1.9.0-alpha-2</geronimo-javamail_1.4_spec.version>
+ <geronimo-javamail_1.5_spec.version>1.0.0-SNAPSHOT</geronimo-javamail_1.5_spec.version>
<myfaces.version>2.3.4</myfaces.version>
<mojarra.version>2.3.3</mojarra.version>
<slf4j.version>1.7.21</slf4j.version>
@@ -1311,16 +1311,16 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.9.0-alpha-2</version>
+ <artifactId>geronimo-javamail_1.5_mail</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_provider</artifactId>
+ <artifactId>geronimo-javamail_1.5_provider</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <artifactId>geronimo-javamail_1.5_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/server/openejb-client/pom.xml b/server/openejb-client/pom.xml
index 2101c35..632ca1c 100644
--- a/server/openejb-client/pom.xml
+++ b/server/openejb-client/pom.xml
@@ -138,7 +138,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ <artifactId>geronimo-javamail_1.5_mail</artifactId>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/server/openejb-cxf-rs/pom.xml b/server/openejb-cxf-rs/pom.xml
index 0576ebf..fe9a915 100644
--- a/server/openejb-cxf-rs/pom.xml
+++ b/server/openejb-cxf-rs/pom.xml
@@ -91,6 +91,10 @@
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.5_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
</exclusion>
<exclusion>
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index cad9533..c680e99 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -67,9 +67,21 @@
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.5_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.5_mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</exclusion>
@@ -176,6 +188,10 @@
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.5_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
</exclusion>
<exclusion>
diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml
index 3ad2c85..2885d29 100644
--- a/tomee/tomee-webapp/pom.xml
+++ b/tomee/tomee-webapp/pom.xml
@@ -140,7 +140,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ <artifactId>geronimo-javamail_1.5_mail</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>