Author: struberg
Date: Mon Jan 21 16:53:28 2013
New Revision: 1436478
URL: http://svn.apache.org/viewvc?rev=1436478&view=rev
Log:
OWB-344 use shaded ASM to prevent clashes with OpenJPA
Modified:
openwebbeans/trunk/webbeans-impl/pom.xml
openwebbeans/trunk/webbeans-tck/pom.xml
openwebbeans/trunk/webbeans-web/pom.xml
Modified: openwebbeans/trunk/webbeans-impl/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/pom.xml?rev=1436478&r1=1436477&r2=1436478&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/pom.xml (original)
+++ openwebbeans/trunk/webbeans-impl/pom.xml Mon Jan 21 16:53:28 2013
@@ -47,18 +47,9 @@
<artifactId>scannotation</artifactId>
</dependency>
-<!--X
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>4.1</version>
- <optional>true</optional>
- </dependency>
--->
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm-shaded</artifactId>
- <version>3.13-SNAPSHOT</version>
</dependency>
<dependency>
Modified: openwebbeans/trunk/webbeans-tck/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/pom.xml?rev=1436478&r1=1436477&r2=1436478&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/pom.xml (original)
+++ openwebbeans/trunk/webbeans-tck/pom.xml Mon Jan 21 16:53:28 2013
@@ -75,18 +75,9 @@
</exclusions>
</dependency>
- <!--X
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>4.1</version>
- <optional>true</optional>
- </dependency>
- -->
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm-shaded</artifactId>
- <version>3.13-SNAPSHOT</version>
</dependency>
<dependency>
Modified: openwebbeans/trunk/webbeans-web/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/pom.xml?rev=1436478&r1=1436477&r2=1436478&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/pom.xml (original)
+++ openwebbeans/trunk/webbeans-web/pom.xml Mon Jan 21 16:53:28 2013
@@ -46,12 +46,10 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>4.1</version>
- <optional>true</optional>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-asm-shaded</artifactId>
</dependency>
<dependency>
@@ -64,6 +62,11 @@
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-el22</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
