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 b499be33efab054c8d1419897ba455beb9f526a7 Author: David Blevins <[email protected]> AuthorDate: Sat Apr 17 16:46:16 2021 -0700 sort dependencies --- tomee/tomee-webapp/pom.xml | 216 ++++++++++++++++++++++----------------------- 1 file changed, 108 insertions(+), 108 deletions(-) diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml index 15bb62c..12a19cf 100644 --- a/tomee/tomee-webapp/pom.xml +++ b/tomee/tomee-webapp/pom.xml @@ -121,77 +121,42 @@ </plugins> </build> <dependencies> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>3.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-catalina</artifactId> - <version>${tomcat.version}</version> - <scope>provided</scope> + <dependency><!-- needed by myfaces --> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>${commons-beanutils.version}</version> </dependency> <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-coyote</artifactId> - <version>${tomcat.version}</version> - <scope>provided</scope> + <groupId>${project.groupId}</groupId> + <artifactId>javaee-api</artifactId> + <classifier>tomcat</classifier> </dependency> <dependency> - <groupId>org.apache.geronimo.javamail</groupId> - <artifactId>geronimo-javamail_1.6_mail</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>openejb-client</artifactId> + <version>${project.version}</version> <scope>runtime</scope> - </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> + <groupId>${project.groupId}</groupId> + <artifactId>javaee-api</artifactId> </exclusion> </exclusions> </dependency> - <dependency> <!-- needed by myfaces --> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>${commons-beanutils.version}</version> - </dependency> <dependency> - <groupId>org.apache.tomee</groupId> - <artifactId>taglibs-shade</artifactId> - <version>${project.version}</version> + <groupId>${project.groupId}</groupId> + <artifactId>openejb-cxf-rs</artifactId> + <scope>runtime</scope> <exclusions> <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>javaee-api</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>javaee-api</artifactId> - <classifier>tomcat</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>openejb-client</artifactId> - <version>${project.version}</version> + <artifactId>openejb-cxf-transport</artifactId> <scope>runtime</scope> <exclusions> <exclusion> @@ -237,22 +202,13 @@ </exclusions> </dependency> <dependency> - <groupId>org.apache.openwebbeans</groupId> - <artifactId>openwebbeans-jsf</artifactId> - <version>${openwebbeans.version}</version> - </dependency> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-api</artifactId> - <version>${myfaces.version}</version> + <groupId>${project.groupId}</groupId> + <artifactId>openejb-rest</artifactId> + <scope>runtime</scope> <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> + <groupId>${project.groupId}</groupId> + <artifactId>javaee-api</artifactId> </exclusion> </exclusions> </dependency> @@ -268,12 +224,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-juli</artifactId> - <version>${tomcat.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>tomee-catalina</artifactId> <version>${project.version}</version> @@ -291,36 +241,30 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>tomee-myfaces</artifactId> + <artifactId>tomee-common</artifactId> <version>${project.version}</version> - <scope>runtime</scope> + <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-mojarra</artifactId> + <artifactId>tomee-jaxrs</artifactId> <version>${project.version}</version> <scope>runtime</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>tomee-common</artifactId> - <version>${project.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> @@ -333,19 +277,22 @@ <groupId>${project.groupId}</groupId> <artifactId>javaee-api</artifactId> </exclusion> - <exclusion> <!-- 'provided' --> + <exclusion><!-- 'provided' --> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-catalina</artifactId> </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.codehaus.swizzle</groupId> - <artifactId>swizzle-stream</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>tomee-mojarra</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>openejb-cxf-rs</artifactId> + <artifactId>tomee-myfaces</artifactId> + <version>${project.version}</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -356,7 +303,8 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>openejb-cxf-transport</artifactId> + <artifactId>tomee-security</artifactId> + <version>${project.version}</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -366,43 +314,95 @@ </exclusions> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>openejb-rest</artifactId> + <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>${project.groupId}</groupId> - <artifactId>javaee-api</artifactId> + <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>${project.groupId}</groupId> - <artifactId>tomee-jaxrs</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-impl</artifactId> + <version>${myfaces.version}</version> <exclusions> <exclusion> - <groupId>${project.groupId}</groupId> - <artifactId>javaee-api</artifactId> + <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>${project.groupId}</groupId> - <artifactId>tomee-security</artifactId> + <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> - <scope>runtime</scope> <exclusions> <exclusion> - <groupId>${project.groupId}</groupId> - <artifactId>javaee-api</artifactId> + <groupId>*</groupId> + <artifactId>*</artifactId> </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.apache.johnzon</groupId> - <artifactId>johnzon-jsonp-strict</artifactId> + <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> </project>
