You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/01/04 21:54:31 UTC
svn commit: r492733 - in /incubator/openejb/trunk/openejb3:
container/openejb-core/pom.xml pom.xml
Author: dblevins
Date: Thu Jan 4 12:54:30 2007
New Revision: 492733
URL: http://svn.apache.org/viewvc?view=rev&rev=492733
Log:
Fixed ActiveMQ dep so it didn't pull in j2ee-management-1.0 and hence ejb-2.1
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
incubator/openejb/trunk/openejb3/pom.xml
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml?view=diff&rev=492733&r1=492732&r2=492733
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml Thu Jan 4 12:54:30 2007
@@ -183,6 +183,10 @@
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ </dependency>
<!-- End ActiveMQ -->
<dependency>
<groupId>org.codehaus.castor</groupId>
@@ -243,6 +247,10 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: incubator/openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/pom.xml?view=diff&rev=492733&r1=492732&r2=492733
==============================================================================
--- incubator/openejb/trunk/openejb3/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/pom.xml Thu Jan 4 12:54:30 2007
@@ -394,18 +394,14 @@
<artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
</exclusion>
<exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
</exclusion>
<exclusion>
<groupId>commons-primitives</groupId>
<artifactId>commons-primitives</artifactId>
</exclusion>
<exclusion>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
</exclusion>
@@ -612,10 +608,6 @@
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
</exclusion>
- <exclusion>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -644,10 +636,6 @@
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
</exclusion>
<exclusion>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.objectweb.howl</groupId>
<artifactId>howl</artifactId>
</exclusion>
@@ -737,6 +725,11 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
<version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ <version>1.0-M1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>