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 2012/09/24 23:48:43 UTC
svn commit: r1389612 - in /openejb/branches/openejb-4.5.0:
container/openejb-core/pom.xml pom.xml
Author: rmannibucau
Date: Mon Sep 24 21:48:43 2012
New Revision: 1389612
URL: http://svn.apache.org/viewvc?rev=1389612&view=rev
Log:
back to our openjpa shade to avoid asm + better AMQ exclusions
Modified:
openejb/branches/openejb-4.5.0/container/openejb-core/pom.xml
openejb/branches/openejb-4.5.0/pom.xml
Modified: openejb/branches/openejb-4.5.0/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.5.0/container/openejb-core/pom.xml?rev=1389612&r1=1389611&r2=1389612&view=diff
==============================================================================
--- openejb/branches/openejb-4.5.0/container/openejb-core/pom.xml (original)
+++ openejb/branches/openejb-4.5.0/container/openejb-core/pom.xml Mon Sep 24 21:48:43 2012
@@ -592,10 +592,17 @@
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</dependency>
+ -->
+ <dependency>
+ <groupId>org.apache.openejb.patch</groupId>
+ <artifactId>openjpa-asm-shaded</artifactId>
+ <version>2.2.0</version>
+ </dependency>
<dependency>
<groupId>org.apache.bval</groupId>
<artifactId>bval-core</artifactId>
Modified: openejb/branches/openejb-4.5.0/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.5.0/pom.xml?rev=1389612&r1=1389611&r2=1389612&view=diff
==============================================================================
--- openejb/branches/openejb-4.5.0/pom.xml (original)
+++ openejb/branches/openejb-4.5.0/pom.xml Mon Sep 24 21:48:43 2012
@@ -934,6 +934,14 @@
<version>${org.apache.activemq.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.fusesource.mqtt-client</groupId>
+ <artifactId>mqtt-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.fusesource.fuse-extra</groupId>
+ <artifactId>fusemq-leveldb</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</exclusion>
@@ -1011,7 +1019,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
</exclusion>
<exclusion>
<groupId>commons-primitives</groupId>
@@ -1449,6 +1457,10 @@
<groupId>net.sf.scannotation</groupId>
<artifactId>scannotation</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>