Author: andygumbrecht
Date: Mon May 27 08:20:52 2013
New Revision: 1486535
URL: http://svn.apache.org/r1486535
Log:
Exclude xbean-finder-shaded conflicts.
Modified:
tomee/tomee/trunk/pom.xml
Modified: tomee/tomee/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1486535&r1=1486534&r2=1486535&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Mon May 27 08:20:52 2013
@@ -1532,6 +1532,10 @@
<groupId>asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-finder-shaded</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1616,6 +1620,12 @@
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
<version>${org.apache.openwebbeans.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-finder-shaded</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<artifactId>openwebbeans-ee-common</artifactId>
