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.git
commit 1d00ecc7657f7600cad2bf4c51207e9254fdf556 Author: David Blevins <[email protected]> AuthorDate: Sat Apr 17 18:27:14 2021 -0700 TOMEE-3721 Remove dependencies between tomee-webapp modules --- boms/tomee-microprofile/pom.xml | 11 - boms/tomee-plume/pom.xml | 22 -- boms/tomee-plus/pom.xml | 11 - .../tomee-microprofile-webapp/pom.xml | 232 ++++++++++++++++++++- tomee/tomee-plume-webapp/pom.xml | 178 +++++++++++++++- tomee/tomee-plus-webapp/pom.xml | 232 ++++++++++++++++++++- 6 files changed, 635 insertions(+), 51 deletions(-) diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml index 8ed2c8e..c8bf14f 100644 --- a/boms/tomee-microprofile/pom.xml +++ b/boms/tomee-microprofile/pom.xml @@ -1499,17 +1499,6 @@ </dependency> <dependency> <groupId>org.apache.tomee</groupId> - <artifactId>tomee-webapp</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <artifactId>*</artifactId> - <groupId>*</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.tomee</groupId> <artifactId>tomee-webservices</artifactId> <version>${project.version}</version> <exclusions> diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml index aec4cbc..e62e158 100644 --- a/boms/tomee-plume/pom.xml +++ b/boms/tomee-plume/pom.xml @@ -189,17 +189,6 @@ </exclusions> </dependency> <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.8</version> - <exclusions> - <exclusion> - <artifactId>*</artifactId> - <groupId>*</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.2</version> @@ -1565,17 +1554,6 @@ </dependency> <dependency> <groupId>org.apache.tomee</groupId> - <artifactId>tomee-webapp</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <artifactId>*</artifactId> - <groupId>*</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.tomee</groupId> <artifactId>tomee-webservices</artifactId> <version>${project.version}</version> <exclusions> diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml index b5b1ffc..15cf877 100644 --- a/boms/tomee-plus/pom.xml +++ b/boms/tomee-plus/pom.xml @@ -1620,17 +1620,6 @@ </dependency> <dependency> <groupId>org.apache.tomee</groupId> - <artifactId>tomee-webapp</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <artifactId>*</artifactId> - <groupId>*</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.tomee</groupId> <artifactId>tomee-webservices</artifactId> <version>${project.version}</version> <exclusions> diff --git a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml index efe11d1..64ed8d4 100644 --- a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml +++ b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml @@ -39,6 +39,16 @@ <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>mp-common</artifactId> @@ -46,6 +56,18 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>openejb-client</artifactId> + <version>${project.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-cxf-rs</artifactId> <scope>runtime</scope> <exclusions> @@ -83,6 +105,42 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>openejb-ejbd</artifactId> + <version>${project.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>${project.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>${project.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-rest</artifactId> <scope>runtime</scope> <exclusions> @@ -94,6 +152,17 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>openejb-server</artifactId> + <version>${project.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> @@ -105,6 +174,22 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>tomee-catalina</artifactId> + <version>${project.version}</version> + <scope>runtime</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> <version>${project.version}</version> <scope>compile</scope> @@ -121,9 +206,61 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>tomee-webapp</artifactId> + <artifactId>tomee-jaxrs</artifactId> <version>${project.version}</version> - <type>war</type> + <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>${project.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>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>tomee-myfaces</artifactId> + <version>${project.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>${project.version}</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>${project.groupId}</groupId> + <artifactId>javaee-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -138,6 +275,97 @@ </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>${project.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 --> diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml index 0bb1f60..01888f2 100644 --- a/tomee/tomee-plume-webapp/pom.xml +++ b/tomee/tomee-plume-webapp/pom.xml @@ -36,8 +36,19 @@ <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>javaee-api</artifactId> + <classifier>tomcat</classifier> + </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>mp-common</artifactId> @@ -45,6 +56,18 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>openejb-client</artifactId> + <version>${project.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-core-eclipselink</artifactId> <scope>runtime</scope> </dependency> @@ -87,6 +110,42 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>openejb-ejbd</artifactId> + <version>${project.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>${project.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>${project.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-rest</artifactId> <scope>runtime</scope> <exclusions> @@ -98,6 +157,17 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>openejb-server</artifactId> + <version>${project.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> @@ -109,6 +179,22 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>tomee-catalina</artifactId> + <version>${project.version}</version> + <scope>runtime</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> <version>${project.version}</version> <scope>compile</scope> @@ -125,9 +211,49 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>tomee-webapp</artifactId> + <artifactId>tomee-jaxrs</artifactId> <version>${project.version}</version> - <type>war</type> + <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>${project.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>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>tomee-security</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>${project.groupId}</groupId> + <artifactId>javaee-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -164,16 +290,63 @@ </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>${project.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> @@ -184,7 +357,6 @@ <scope>runtime</scope> </dependency> </dependencies> - <build> <plugins> <!-- Looks like the war still have myfaces because of the overlay with tomee-webapp --> diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml index cf08fa8..0ff687f 100644 --- a/tomee/tomee-plus-webapp/pom.xml +++ b/tomee/tomee-plus-webapp/pom.xml @@ -36,6 +36,16 @@ </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>javaee-api</artifactId> + <classifier>tomcat</classifier> + </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>mp-common</artifactId> @@ -43,6 +53,18 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>openejb-client</artifactId> + <version>${project.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-cxf-rs</artifactId> <version>${project.version}</version> <scope>runtime</scope> @@ -83,6 +105,42 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>openejb-ejbd</artifactId> + <version>${project.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>${project.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>${project.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-rest</artifactId> <version>${project.version}</version> <scope>runtime</scope> @@ -95,6 +153,17 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>openejb-server</artifactId> + <version>${project.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>${project.version}</version> <exclusions> @@ -107,6 +176,22 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>tomee-catalina</artifactId> + <version>${project.version}</version> + <scope>runtime</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> <version>${project.version}</version> <scope>compile</scope> @@ -123,9 +208,61 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>tomee-webapp</artifactId> + <artifactId>tomee-jaxrs</artifactId> <version>${project.version}</version> - <type>war</type> + <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>${project.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>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>tomee-myfaces</artifactId> + <version>${project.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>${project.version}</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>${project.groupId}</groupId> + <artifactId>javaee-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -173,6 +310,97 @@ </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>${project.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> <plugins>
