This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-jakarta.git
The following commit(s) were added to refs/heads/master by this push:
new 3d8b76b TOMEE-3721 Remove dependencies between tomee-webapp modules
Also fix the plume profile
3d8b76b is described below
commit 3d8b76b2368fb5bcf4f3d0286711db4d6d1da33f
Author: David Blevins <[email protected]>
AuthorDate: Sat Apr 17 20:20:51 2021 -0700
TOMEE-3721 Remove dependencies between tomee-webapp modules
Also fix the plume profile
---
tomee/apache-tomee/pom.xml | 3 -
tomee/pom.xml | 1 -
tomee/tomee-microprofile-webapp/pom.xml | 254 ++++++++++++++++++++++++++--
tomee/tomee-plume-webapp/pom.xml | 232 ++++++++++++++++++++++----
tomee/tomee-plus-webapp/pom.xml | 287 ++++++++++++++++++++++++++++----
5 files changed, 687 insertions(+), 90 deletions(-)
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index ee85362..ada8da3 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -565,9 +565,6 @@
</profile>
<profile>
<id>plume</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<build>
<plugins>
<plugin>
diff --git a/tomee/pom.xml b/tomee/pom.xml
index 52f2057..60ec224 100644
--- a/tomee/pom.xml
+++ b/tomee/pom.xml
@@ -51,7 +51,6 @@
<profile>
<id>plume</id>
<modules>
- <module>tomee-webprofile-webapp</module>
<module>tomee-plume-webapp</module>
<module>apache-tomee</module>
</modules>
diff --git a/tomee/tomee-microprofile-webapp/pom.xml
b/tomee/tomee-microprofile-webapp/pom.xml
index f3b6439..6ff347d 100644
--- a/tomee/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile-webapp/pom.xml
@@ -31,7 +31,7 @@
<artifactId>tomee-microprofile-webapp</artifactId>
<name>TomEE :: TomEE :: MicroProfile Webapp</name>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<properties>
<tomee.build.name>${project.groupId}.tomee.microprofile.webapp</tomee.build.name>
@@ -39,11 +39,32 @@
<dependencies>
+ <dependency><!-- needed by myfaces -->
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>${commons-beanutils.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ <classifier>tomcat</classifier>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tomee-webapp</artifactId>
+ <artifactId>mp-common</artifactId>
<version>${tomee.version}</version>
- <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-client</artifactId>
+ <version>${tomee.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -76,13 +97,47 @@
<groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-ejbd</artifactId>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
- <!-- transitive from xerces but in test scope in parent so needed here
-->
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-hsql</artifactId>
+ <version>${tomee.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-http</artifactId>
+ <version>${tomee.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -97,6 +152,17 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>openejb-server</artifactId>
+ <version>${tomee.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-webservices</artifactId>
<exclusions>
<exclusion>
@@ -108,7 +174,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tomee-webservices</artifactId>
+ <artifactId>tomee-catalina</artifactId>
<version>${tomee.version}</version>
<scope>runtime</scope>
<exclusions>
@@ -116,32 +182,194 @@
<groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ </exclusion>
</exclusions>
</dependency>
-
- <!-- MicroProfile -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>mp-common</artifactId>
+ <artifactId>tomee-common</artifactId>
<version>${tomee.version}</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tomee-common</artifactId>
+ <artifactId>tomee-jaxrs</artifactId>
<version>${tomee.version}</version>
- <scope>compile</scope>
+ <scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tomee-loader</artifactId>
+ <version>${tomee.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
<exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ <exclusion><!-- 'provided' -->
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
</exclusion>
</exclusions>
</dependency>
-
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tomee-mojarra</artifactId>
+ <version>${tomee.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tomee-myfaces</artifactId>
+ <version>${tomee.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tomee-security</artifactId>
+ <version>${tomee.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tomee-webservices</artifactId>
+ <version>${tomee.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency><!-- MicroProfile -->
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.6_mail</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-jsonp-strict</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${myfaces.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf</artifactId>
+ <version>${openwebbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>taglibs-shade</artifactId>
+ <version>${tomee.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.swizzle</groupId>
+ <artifactId>swizzle-stream</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <scope>runtime</scope><!-- transitive from xerces but in test scope in
parent so needed here -->
+ </dependency>
</dependencies>
<build>
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index 65e5927..4c4b624 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -31,55 +31,86 @@
<artifactId>tomee-plume-webapp</artifactId>
<name>TomEE :: TomEE :: Plume Webapp</name>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<properties>
<tomee.build.name>${project.groupId}.tomee.plume.webapp</tomee.build.name>
</properties>
<dependencies>
+ <dependency><!-- needed by myfaces -->
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>${commons-beanutils.version}</version>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>openejb-core-eclipselink</artifactId>
- <scope>runtime</scope>
+ <artifactId>javaee-api</artifactId>
+ <classifier>tomcat</classifier>
</dependency>
<dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>jakarta.faces</artifactId>
- <scope>runtime</scope>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mp-common</artifactId>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tomee-webapp</artifactId>
+ <artifactId>openejb-client</artifactId>
<version>${tomee.version}</version>
- <type>war</type>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-core-eclipselink</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-jdbc-store</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-cxf-rs</artifactId>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-cxf-transport</artifactId>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>openejb-cxf-rs</artifactId>
+ <artifactId>openejb-cxf</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>openejb-cxf-transport</artifactId>
+ <artifactId>openejb-ejbd</artifactId>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -90,7 +121,8 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>openejb-cxf</artifactId>
+ <artifactId>openejb-hsql</artifactId>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -100,10 +132,16 @@
</exclusions>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-http</artifactId>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
- <!-- transitive from xerces but in test scope in parent so needed here
-->
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -118,6 +156,17 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>openejb-server</artifactId>
+ <version>${tomee.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-webservices</artifactId>
<exclusions>
<exclusion>
@@ -129,7 +178,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tomee-webservices</artifactId>
+ <artifactId>tomee-catalina</artifactId>
<version>${tomee.version}</version>
<scope>runtime</scope>
<exclusions>
@@ -137,66 +186,175 @@
<groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tomee-common</artifactId>
+ <version>${tomee.version}</version>
+ <scope>compile</scope>
<exclusions>
<exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
</exclusion>
</exclusions>
</dependency>
-
- <!-- if i'm not mistaken we decided to remove it from our default
deliveries
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>openejb-provisionning</artifactId>
+ <artifactId>tomee-jaxrs</artifactId>
<version>${tomee.version}</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>openejb-ssh</artifactId>
+ <artifactId>tomee-loader</artifactId>
<version>${tomee.version}</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ <exclusion><!-- 'provided' -->
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- -->
-
- <!-- MicroProfile -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>mp-common</artifactId>
+ <artifactId>tomee-mojarra</artifactId>
<version>${tomee.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tomee-common</artifactId>
+ <artifactId>tomee-security</artifactId>
<version>${tomee.version}</version>
- <scope>compile</scope>
+ <scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tomee-webservices</artifactId>
+ <version>${tomee.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
<exclusion>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-jdbc-store</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.6_mail</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-jsonp-strict</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf</artifactId>
+ <version>${openwebbeans.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>taglibs-shade</artifactId>
+ <version>${tomee.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.swizzle</groupId>
+ <artifactId>swizzle-stream</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.faces</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 47aee6f..7aed2b7 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -29,29 +29,39 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-plus-webapp</artifactId>
<name>TomEE :: TomEE :: Plus Webapp</name>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<properties>
<tomee.build.name>${project.groupId}.tomee.plus.webapp</tomee.build.name>
</properties>
<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tomee-webapp</artifactId>
- <version>${tomee.version}</version>
- <type>war</type>
+
+ <dependency><!-- needed by myfaces -->
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>${commons-beanutils.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ <classifier>tomcat</classifier>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-jdbc-store</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mp-common</artifactId>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-client</artifactId>
+ <version>${tomee.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -87,6 +97,46 @@
<groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-ejbd</artifactId>
+ <version>${tomee.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-hsql</artifactId>
+ <version>${tomee.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-http</artifactId>
+ <version>${tomee.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -103,6 +153,17 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>openejb-server</artifactId>
+ <version>${tomee.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>openejb-webservices</artifactId>
<version>${tomee.version}</version>
<exclusions>
@@ -115,7 +176,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tomee-webservices</artifactId>
+ <artifactId>tomee-catalina</artifactId>
<version>${tomee.version}</version>
<scope>runtime</scope>
<exclusions>
@@ -123,69 +184,223 @@
<groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tomee-common</artifactId>
+ <version>${tomee.version}</version>
+ <scope>compile</scope>
<exclusions>
<exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.batchee</groupId>
- <artifactId>batchee-jbatch</artifactId>
- <version>${batchee.version}</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tomee-jaxrs</artifactId>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jcs-jcache</artifactId>
- <version>${jcs.version}</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tomee-loader</artifactId>
+ <version>${tomee.version}</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ <exclusion><!-- 'provided' -->
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
- <!-- if i'm not mistaken we decided to remove it from our default
deliveries
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>openejb-provisionning</artifactId>
+ <artifactId>tomee-mojarra</artifactId>
<version>${tomee.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>openejb-ssh</artifactId>
+ <artifactId>tomee-myfaces</artifactId>
<version>${tomee.version}</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- -->
-
- <!-- MicroProfile -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>mp-common</artifactId>
+ <artifactId>tomee-security</artifactId>
<version>${tomee.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tomee-common</artifactId>
+ <artifactId>tomee-webservices</artifactId>
<version>${tomee.version}</version>
- <scope>compile</scope>
+ <scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-jdbc-store</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.batchee</groupId>
+ <artifactId>batchee-jbatch</artifactId>
+ <version>${batchee.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-jcache</artifactId>
+ <version>${jcs.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <exclusions>
<exclusion>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.6_mail</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-jsonp-strict</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${myfaces.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf</artifactId>
+ <version>${openwebbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>taglibs-shade</artifactId>
+ <version>${tomee.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.swizzle</groupId>
+ <artifactId>swizzle-stream</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
