You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2019/08/05 13:29:48 UTC
[tomee] branch master updated: Prevent javamail being included twice
This is an automated email from the ASF dual-hosted git repository.
jgallimore 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 ec078e4 Prevent javamail being included twice
new e211993 Merge branch 'master' of github.com:apache/tomee
ec078e4 is described below
commit ec078e44f18aba7b186a2b5569c99f1efc5168fb
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Mon Aug 5 14:28:27 2019 +0100
Prevent javamail being included twice
---
.../tomee-microprofile-webapp/src/main/assembly/war.xml | 2 ++
tomee/tomee-plume-webapp/src/main/assembly/war.xml | 2 ++
tomee/tomee-plus-webapp/src/main/assembly/war.xml | 2 ++
3 files changed, 6 insertions(+)
diff --git a/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/assembly/war.xml b/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/assembly/war.xml
index 9a7ba10..9c2b63f 100644
--- a/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/assembly/war.xml
+++ b/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/assembly/war.xml
@@ -77,6 +77,8 @@
<!-- wars and pom -->
<exclude>*:war</exclude>
<exclude>*:pom</exclude>
+ <exclude>org.apache.geronimo.specs:geronimo-javamail_1.5_spec</exclude>
+ <exclude>org.apache.geronimo.javamail:geronimo-javamail_1.5_mail</exclude>
</excludes>
</dependencySet>
<dependencySet>
diff --git a/tomee/tomee-plume-webapp/src/main/assembly/war.xml b/tomee/tomee-plume-webapp/src/main/assembly/war.xml
index a87a364..ca97890 100644
--- a/tomee/tomee-plume-webapp/src/main/assembly/war.xml
+++ b/tomee/tomee-plume-webapp/src/main/assembly/war.xml
@@ -89,6 +89,8 @@
<!-- wars and pom -->
<exclude>*:war</exclude>
<exclude>*:pom</exclude>
+ <exclude>org.apache.geronimo.specs:geronimo-javamail_1.5_spec</exclude>
+ <exclude>org.apache.geronimo.javamail:geronimo-javamail_1.5_mail</exclude>
</excludes>
</dependencySet>
<dependencySet>
diff --git a/tomee/tomee-plus-webapp/src/main/assembly/war.xml b/tomee/tomee-plus-webapp/src/main/assembly/war.xml
index 77ece96..a229ffb 100644
--- a/tomee/tomee-plus-webapp/src/main/assembly/war.xml
+++ b/tomee/tomee-plus-webapp/src/main/assembly/war.xml
@@ -84,6 +84,8 @@
<!-- wars and pom -->
<exclude>*:war</exclude>
<exclude>*:pom</exclude>
+ <exclude>org.apache.geronimo.specs:geronimo-javamail_1.5_spec</exclude>
+ <exclude>org.apache.geronimo.javamail:geronimo-javamail_1.5_mail</exclude>
</excludes>
</dependencySet>
<dependencySet>