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 dfb2c169b2 Also apply to other webapps
dfb2c169b2 is described below
commit dfb2c169b266675479f6eac06aa623fda9af891b
Author: Jean-Louis Monteiro <[email protected]>
AuthorDate: Thu Jun 30 17:16:22 2022 +0200
Also apply to other webapps
---
.../src/main/assembly/war.xml | 47 ++++++++++++++++++++++
tomee/tomee-plume-webapp/src/main/assembly/war.xml | 47 ++++++++++++++++++++++
tomee/tomee-plus-webapp/src/main/assembly/war.xml | 47 ++++++++++++++++++++++
tomee/tomee-webapp/src/main/assembly/war.xml | 17 ++++++--
4 files changed, 154 insertions(+), 4 deletions(-)
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 4578873a2f..35a661b910 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
@@ -81,6 +81,53 @@
<exclude>org.apache.geronimo.javamail:geronimo-javamail_1.5_mail</exclude>
<exclude>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</exclude>
<exclude>org.apache.geronimo.javamail:geronimo-javamail_1.4_mail</exclude>
+
+ <!--
+ list bellow should not be required because Maven should exclude them
but looks like sometimes
+ it picks up transitive dependencies from shaded libraries
+ -->
+ <!-- exclude shaded artifacts because they are under our own groupId
-->
+ <exclude>org.apache.activemq:activemq-broker</exclude>
+ <exclude>org.apache.activemq:activemq-kahadb-store</exclude>
+ <exclude>org.apache.activemq:activemq-ra</exclude>
+ <exclude>org.apache.commons.dbcp2:*</exclude>
+ <exclude>commons-fileupload:*</exclude>
+ <exclude>org.apache.cxf:*</exclude>
+ <exclude>org.metatype.sxc:*</exclude>
+ <exclude>org.apache.taglibs:*</exclude>
+
+ <!-- jakartaee-api -->
+ <exclude>com.sun.mail:*</exclude>
+ <exclude>jakarta.activation:*</exclude>
+ <exclude>jakarta.annotation:*</exclude>
+ <exclude>jakarta.authentication:*</exclude>
+ <exclude>jakarta.authorization:*</exclude>
+ <exclude>jakarta.batch:*</exclude>
+ <exclude>jakarta.ejb:*</exclude>
+ <exclude>jakarta.el:*</exclude>
+ <exclude>jakarta.enterprise:*</exclude>
+ <exclude>jakarta.enterprise.concurrent:*</exclude>
+ <exclude>jakarta.faces:*</exclude>
+ <exclude>jakarta.inject:*</exclude>
+ <exclude>jakarta.interceptor:*</exclude>
+ <exclude>jakarta.jms:*</exclude>
+ <exclude>jakarta.json:*</exclude>
+ <exclude>jakarta.json.bind:*</exclude>
+ <exclude>jakarta.jws:*</exclude>
+ <exclude>jakarta.mail:*</exclude>
+ <exclude>jakarta.persistence:*</exclude>
+ <exclude>jakarta.platform:*</exclude>
+ <exclude>jakarta.resource:*</exclude>
+ <exclude>jakarta.security.enterprise:*</exclude>
+ <exclude>jakarta.servlet:*</exclude>
+ <exclude>jakarta.servlet.jsp:*</exclude>
+ <exclude>jakarta.servlet.jsp.jstl:*</exclude>
+ <exclude>jakarta.transaction:*</exclude>
+ <exclude>jakarta.validation:*</exclude>
+ <exclude>jakarta.websocket:*</exclude>
+ <exclude>jakarta.ws.rs:*</exclude>
+ <exclude>jakarta.xml.bind:*</exclude>
+ <exclude>jakarta.xml.soap:*</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 bd05c8f662..227c0afb5d 100644
--- a/tomee/tomee-plume-webapp/src/main/assembly/war.xml
+++ b/tomee/tomee-plume-webapp/src/main/assembly/war.xml
@@ -100,6 +100,53 @@
<exclude>org.apache.geronimo.javamail:geronimo-javamail_1.5_mail</exclude>
<exclude>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</exclude>
<exclude>org.apache.geronimo.javamail:geronimo-javamail_1.4_mail</exclude>
+
+ <!--
+ list bellow should not be required because Maven should exclude them
but looks like sometimes
+ it picks up transitive dependencies from shaded libraries
+ -->
+ <!-- exclude shaded artifacts because they are under our own groupId
-->
+ <exclude>org.apache.activemq:activemq-broker</exclude>
+ <exclude>org.apache.activemq:activemq-kahadb-store</exclude>
+ <exclude>org.apache.activemq:activemq-ra</exclude>
+ <exclude>org.apache.commons.dbcp2:*</exclude>
+ <exclude>commons-fileupload:*</exclude>
+ <exclude>org.apache.cxf:*</exclude>
+ <exclude>org.metatype.sxc:*</exclude>
+ <exclude>org.apache.taglibs:*</exclude>
+
+ <!-- jakartaee-api -->
+ <exclude>com.sun.mail:*</exclude>
+ <exclude>jakarta.activation:*</exclude>
+ <exclude>jakarta.annotation:*</exclude>
+ <exclude>jakarta.authentication:*</exclude>
+ <exclude>jakarta.authorization:*</exclude>
+ <exclude>jakarta.batch:*</exclude>
+ <exclude>jakarta.ejb:*</exclude>
+ <exclude>jakarta.el:*</exclude>
+ <exclude>jakarta.enterprise:*</exclude>
+ <exclude>jakarta.enterprise.concurrent:*</exclude>
+ <exclude>jakarta.faces:*</exclude>
+ <exclude>jakarta.inject:*</exclude>
+ <exclude>jakarta.interceptor:*</exclude>
+ <exclude>jakarta.jms:*</exclude>
+ <exclude>jakarta.json:*</exclude>
+ <exclude>jakarta.json.bind:*</exclude>
+ <exclude>jakarta.jws:*</exclude>
+ <exclude>jakarta.mail:*</exclude>
+ <exclude>jakarta.persistence:*</exclude>
+ <exclude>jakarta.platform:*</exclude>
+ <exclude>jakarta.resource:*</exclude>
+ <exclude>jakarta.security.enterprise:*</exclude>
+ <exclude>jakarta.servlet:*</exclude>
+ <exclude>jakarta.servlet.jsp:*</exclude>
+ <exclude>jakarta.servlet.jsp.jstl:*</exclude>
+ <exclude>jakarta.transaction:*</exclude>
+ <exclude>jakarta.validation:*</exclude>
+ <exclude>jakarta.websocket:*</exclude>
+ <exclude>jakarta.ws.rs:*</exclude>
+ <exclude>jakarta.xml.bind:*</exclude>
+ <exclude>jakarta.xml.soap:*</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 acf3834d96..c0d3995690 100644
--- a/tomee/tomee-plus-webapp/src/main/assembly/war.xml
+++ b/tomee/tomee-plus-webapp/src/main/assembly/war.xml
@@ -94,6 +94,53 @@
<exclude>org.apache.geronimo.javamail:geronimo-javamail_1.5_mail</exclude>
<exclude>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</exclude>
<exclude>org.apache.geronimo.javamail:geronimo-javamail_1.4_mail</exclude>
+
+ <!--
+ list bellow should not be required because Maven should exclude them
but looks like sometimes
+ it picks up transitive dependencies from shaded libraries
+ -->
+ <!-- exclude shaded artifacts because they are under our own groupId
-->
+ <exclude>org.apache.activemq:activemq-broker</exclude>
+ <exclude>org.apache.activemq:activemq-kahadb-store</exclude>
+ <exclude>org.apache.activemq:activemq-ra</exclude>
+ <exclude>org.apache.commons.dbcp2:*</exclude>
+ <exclude>commons-fileupload:*</exclude>
+ <exclude>org.apache.cxf:*</exclude>
+ <exclude>org.metatype.sxc:*</exclude>
+ <exclude>org.apache.taglibs:*</exclude>
+
+ <!-- jakartaee-api -->
+ <exclude>com.sun.mail:*</exclude>
+ <exclude>jakarta.activation:*</exclude>
+ <exclude>jakarta.annotation:*</exclude>
+ <exclude>jakarta.authentication:*</exclude>
+ <exclude>jakarta.authorization:*</exclude>
+ <exclude>jakarta.batch:*</exclude>
+ <exclude>jakarta.ejb:*</exclude>
+ <exclude>jakarta.el:*</exclude>
+ <exclude>jakarta.enterprise:*</exclude>
+ <exclude>jakarta.enterprise.concurrent:*</exclude>
+ <exclude>jakarta.faces:*</exclude>
+ <exclude>jakarta.inject:*</exclude>
+ <exclude>jakarta.interceptor:*</exclude>
+ <exclude>jakarta.jms:*</exclude>
+ <exclude>jakarta.json:*</exclude>
+ <exclude>jakarta.json.bind:*</exclude>
+ <exclude>jakarta.jws:*</exclude>
+ <exclude>jakarta.mail:*</exclude>
+ <exclude>jakarta.persistence:*</exclude>
+ <exclude>jakarta.platform:*</exclude>
+ <exclude>jakarta.resource:*</exclude>
+ <exclude>jakarta.security.enterprise:*</exclude>
+ <exclude>jakarta.servlet:*</exclude>
+ <exclude>jakarta.servlet.jsp:*</exclude>
+ <exclude>jakarta.servlet.jsp.jstl:*</exclude>
+ <exclude>jakarta.transaction:*</exclude>
+ <exclude>jakarta.validation:*</exclude>
+ <exclude>jakarta.websocket:*</exclude>
+ <exclude>jakarta.ws.rs:*</exclude>
+ <exclude>jakarta.xml.bind:*</exclude>
+ <exclude>jakarta.xml.soap:*</exclude>
</excludes>
</dependencySet>
<dependencySet>
diff --git a/tomee/tomee-webapp/src/main/assembly/war.xml
b/tomee/tomee-webapp/src/main/assembly/war.xml
index e11b8e03d4..5a8b9a886d 100644
--- a/tomee/tomee-webapp/src/main/assembly/war.xml
+++ b/tomee/tomee-webapp/src/main/assembly/war.xml
@@ -121,28 +121,37 @@
<exclude>org.apache.taglibs:*</exclude>
<!-- jakartaee-api -->
+ <exclude>com.sun.mail:*</exclude>
+ <exclude>jakarta.activation:*</exclude>
<exclude>jakarta.annotation:*</exclude>
+ <exclude>jakarta.authentication:*</exclude>
<exclude>jakarta.authorization:*</exclude>
<exclude>jakarta.batch:*</exclude>
<exclude>jakarta.ejb:*</exclude>
<exclude>jakarta.el:*</exclude>
+ <exclude>jakarta.enterprise:*</exclude>
<exclude>jakarta.enterprise.concurrent:*</exclude>
- <exclude>jakarta.enterprise.inject:*</exclude>
+ <exclude>jakarta.faces:*</exclude>
+ <exclude>jakarta.inject:*</exclude>
<exclude>jakarta.interceptor:*</exclude>
<exclude>jakarta.jms:*</exclude>
- <exclude>jakarta.json.bind:*</exclude>
<exclude>jakarta.json:*</exclude>
+ <exclude>jakarta.json.bind:*</exclude>
<exclude>jakarta.jws:*</exclude>
+ <exclude>jakarta.mail:*</exclude>
<exclude>jakarta.persistence:*</exclude>
+ <exclude>jakarta.platform:*</exclude>
<exclude>jakarta.resource:*</exclude>
<exclude>jakarta.security.enterprise:*</exclude>
<exclude>jakarta.servlet:*</exclude>
+ <exclude>jakarta.servlet.jsp:*</exclude>
+ <exclude>jakarta.servlet.jsp.jstl:*</exclude>
<exclude>jakarta.transaction:*</exclude>
<exclude>jakarta.validation:*</exclude>
+ <exclude>jakarta.websocket:*</exclude>
<exclude>jakarta.ws.rs:*</exclude>
- <exclude>jakarta.xml.soap:*</exclude>
<exclude>jakarta.xml.bind:*</exclude>
- <exclude>jakarta.xml.ws:*</exclude>
+ <exclude>jakarta.xml.soap:*</exclude>
</excludes>
</dependencySet>
<dependencySet>
