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
commit fad7e4e2a85ec6fe4633e30a1a38c39ee344f81f Author: Jean-Louis Monteiro <[email protected]> AuthorDate: Mon Sep 9 11:23:53 2019 +0200 Update javaee api and add back javamail and activation --- 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 | 9 ++++++-- pom.xml | 25 +++++++++++++++-------- server/openejb-client/pom.xml | 3 +-- server/openejb-cxf/pom.xml | 12 ----------- tomee/tomee-webapp/pom.xml | 2 +- 8 files changed, 26 insertions(+), 35 deletions(-) diff --git a/arquillian/arquillian-tomee-common/pom.xml b/arquillian/arquillian-tomee-common/pom.xml index a45667c..8c2003f 100644 --- a/arquillian/arquillian-tomee-common/pom.xml +++ b/arquillian/arquillian-tomee-common/pom.xml @@ -150,10 +150,6 @@ <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 724229f..2cf944a 100644 --- a/arquillian/arquillian-tomee-webapp-remote/pom.xml +++ b/arquillian/arquillian-tomee-webapp-remote/pom.xml @@ -168,10 +168,6 @@ <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 d9a647e..5f98292 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.5_mail</artifactId> + <artifactId>geronimo-javamail_1.4_mail</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml index 2a45a93..5b3d1d8 100644 --- a/container/openejb-core/pom.xml +++ b/container/openejb-core/pom.xml @@ -551,14 +551,19 @@ <groupId>org.objectweb.howl</groupId> <artifactId>howl</artifactId> </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-activation_1.1_spec</artifactId> + <version>${geronimo-activation_1.1_spec.version}</version> + </dependency> <!-- JavaMail --> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-javamail_1.5_spec</artifactId> + <artifactId>geronimo-javamail_1.4_spec</artifactId> </dependency> <dependency> <groupId>org.apache.geronimo.javamail</groupId> - <artifactId>geronimo-javamail_1.5_mail</artifactId> + <artifactId>geronimo-javamail_1.4_mail</artifactId> </dependency> <!-- End: JavaMail --> <dependency> diff --git a/pom.xml b/pom.xml index dcc3874..10265b2 100644 --- a/pom.xml +++ b/pom.xml @@ -103,7 +103,16 @@ <tomee.build.name>${project.groupId}.${project.artifactId}</tomee.build.name> <!-- To easily change the javaee api version --> - <version.javaee-api>8.0-2-SNAPSHOT</version.javaee-api> + <version.javaee-api>8.0-2</version.javaee-api> + + <!-- + Activation and JavaMail are both API and IMPL so we don't have them in the javaee-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 javaee-api.jar. Different lifecycle. + --> + <geronimo-activation_1.1_spec.version>1.1</geronimo-activation_1.1_spec.version> + <geronimo-javamail_1.4_spec.version>1.7.1</geronimo-javamail_1.4_spec.version> + <geronimo-javamail_1.4_mail.version>1.9.0-alpha-2</geronimo-javamail_1.4_mail.version> <openjpa.version>3.1.0</openjpa.version> <openwebbeans.version>2.0.9</openwebbeans.version> @@ -184,8 +193,6 @@ <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.5_spec.version>1.0.0-SNAPSHOT</geronimo-javamail_1.5_spec.version> - <geronimo-javamail_1.5_mail.version>1.0.0-SNAPSHOT</geronimo-javamail_1.5_mail.version> <myfaces.version>2.3.4</myfaces.version> <mojarra.version>2.3.3</mojarra.version> <slf4j.version>1.7.21</slf4j.version> @@ -1318,21 +1325,21 @@ </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-javamail_1.5_spec</artifactId> - <version>${geronimo-javamail_1.5_spec.version}</version> + <artifactId>geronimo-javamail_1.4_spec</artifactId> + <version>${geronimo-javamail_1.4_spec.version}</version> </dependency> <dependency> <groupId>org.apache.geronimo.javamail</groupId> - <artifactId>geronimo-javamail_1.5_mail</artifactId> - <version>${geronimo-javamail_1.5_mail.version}</version> + <artifactId>geronimo-javamail_1.4_mail</artifactId> + <version>${geronimo-javamail_1.4_mail.version}</version> <exclusions> <exclusion> <groupId>org.apache.geronimo.javamail</groupId> - <artifactId>geronimo-javamail_1.5_provider</artifactId> + <artifactId>geronimo-javamail_1.4_provider</artifactId> </exclusion> <exclusion> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-javamail_1.5_spec</artifactId> + <artifactId>geronimo-javamail_1.4_spec</artifactId> </exclusion> </exclusions> </dependency> diff --git a/server/openejb-client/pom.xml b/server/openejb-client/pom.xml index 4d4fe8b..8e14994 100644 --- a/server/openejb-client/pom.xml +++ b/server/openejb-client/pom.xml @@ -138,8 +138,7 @@ </dependency> <dependency> <groupId>org.apache.geronimo.javamail</groupId> - <artifactId>geronimo-javamail_1.5_mail</artifactId> - <optional>true</optional> + <artifactId>geronimo-javamail_1.4_mail</artifactId> </dependency> <dependency> <groupId>org.apache.tomee.bom</groupId> diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml index 0ec13c7..4cd461e 100644 --- a/server/openejb-cxf/pom.xml +++ b/server/openejb-cxf/pom.xml @@ -67,14 +67,6 @@ <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> @@ -173,10 +165,6 @@ </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 ef8c103..155be5b 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.5_mail</artifactId> + <artifactId>geronimo-javamail_1.4_mail</artifactId> <scope>runtime</scope> </dependency> <dependency>
