You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/08/05 23:33:57 UTC
svn commit: r1616011 - in /tomee/tomee/trunk/tomee: pom.xml
tomee-embedded/pom.xml
Author: rmannibucau
Date: Tue Aug 5 21:33:57 2014
New Revision: 1616011
URL: http://svn.apache.org/r1616011
Log:
making tomee embedded shade a bit cleaner, still few things fixable but no more blocking
Modified:
tomee/tomee/trunk/tomee/pom.xml
tomee/tomee/trunk/tomee/tomee-embedded/pom.xml
Modified: tomee/tomee/trunk/tomee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/pom.xml?rev=1616011&r1=1616010&r2=1616011&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/pom.xml (original)
+++ tomee/tomee/trunk/tomee/pom.xml Tue Aug 5 21:33:57 2014
@@ -220,7 +220,7 @@
<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
- <version>3.5.1</version>
+ <version>4.4</version>
</dependency>
<dependency>
<artifactId>commons-beanutils</artifactId>
@@ -292,6 +292,16 @@
<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>
@@ -299,6 +309,14 @@
<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>
+ <exclusion>
<artifactId>commons-beanutils</artifactId>
<groupId>commons-beanutils</groupId>
</exclusion>
Modified: tomee/tomee/trunk/tomee/tomee-embedded/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-embedded/pom.xml?rev=1616011&r1=1616010&r2=1616011&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-embedded/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-embedded/pom.xml Tue Aug 5 21:33:57 2014
@@ -78,6 +78,26 @@
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-catalina</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>tomcat-juli</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>javaee-api</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>tomcat-annotations-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ <scope>compile</scope>
+ <classifier>tomcat</classifier>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
@@ -97,6 +117,20 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-beautils-core</artifactId>
+ <groupId>commons-beautils</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>javaee-api</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
@@ -104,7 +138,7 @@
<scope>compile</scope>
<exclusions>
<exclusion>
- <artifactId>commons-beanutils</artifactId>
+ <artifactId>commons-beanutils-core</artifactId>
<groupId>commons-beanutils</groupId>
</exclusion>
</exclusions>
@@ -121,27 +155,61 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>tomcat-juli</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-dbcp</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>tomcat-juli</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>tomcat-annotations-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>tomcat-juli</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina-ha</artifactId>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>tomcat-juli</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-coyote</artifactId>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>tomcat-juli</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
@@ -152,6 +220,10 @@
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>tomcat-juli</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -166,21 +238,18 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>javaee-api</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-io</groupId>