You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2013/02/14 14:33:37 UTC
svn commit: r1446172 - in /tomee/tomee/trunk: ./
arquillian/arquillian-tomee-common/
arquillian/arquillian-tomee-webapp-remote/ assembly/openejb-lite/
container/openejb-core/ examples/client-resource-lookup-preview/
server/openejb-server/ tomee/ tomee/...
Author: andygumbrecht
Date: Thu Feb 14 13:33:36 2013
New Revision: 1446172
URL: http://svn.apache.org/r1446172
Log:
ActimeMQ 5.8.0
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
tomee/tomee/trunk/assembly/openejb-lite/pom.xml
tomee/tomee/trunk/container/openejb-core/pom.xml
tomee/tomee/trunk/examples/client-resource-lookup-preview/pom.xml
tomee/tomee/trunk/pom.xml
tomee/tomee/trunk/server/openejb-server/pom.xml
tomee/tomee/trunk/tomee/pom.xml
tomee/tomee/trunk/tomee/tomee-plus-webapp/pom.xml
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml?rev=1446172&r1=1446171&r2=1446172&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml Thu Feb 14 13:33:36 2013
@@ -120,7 +120,7 @@
<groupId>org.apache.activemq</groupId>
</exclusion>
<exclusion>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
<groupId>org.apache.activemq</groupId>
</exclusion>
<exclusion>
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml?rev=1446172&r1=1446171&r2=1446172&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml Thu Feb 14 13:33:36 2013
@@ -128,7 +128,7 @@
<groupId>org.apache.activemq</groupId>
</exclusion>
<exclusion>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
<groupId>org.apache.activemq</groupId>
</exclusion>
<exclusion>
Modified: tomee/tomee/trunk/assembly/openejb-lite/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/assembly/openejb-lite/pom.xml?rev=1446172&r1=1446171&r2=1446172&view=diff
==============================================================================
--- tomee/tomee/trunk/assembly/openejb-lite/pom.xml (original)
+++ tomee/tomee/trunk/assembly/openejb-lite/pom.xml Thu Feb 14 13:33:36 2013
@@ -78,7 +78,7 @@
<exclusions>
<exclusion>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.activemq</groupId>
Modified: tomee/tomee/trunk/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/pom.xml?rev=1446172&r1=1446171&r2=1446172&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-core/pom.xml Thu Feb 14 13:33:36 2013
@@ -114,11 +114,11 @@
javax.xml.ws.soap,
javax.xml.ws.spi,
javax.xml.ws.wsaddressing,
- org.apache.activemq.broker;resolution:=optional;version="[5.4,6)",
- org.apache.activemq.ra;resolution:=optional;version="[5.4,6)",
- org.apache.activemq.store;resolution:=optional;version="[5.4,6)",
- org.apache.activemq.store.jdbc;resolution:=optional;version="[5.4,6)",
- org.apache.activemq.store.memory;resolution:=optional;version="[5.4,6)",
+ org.apache.activemq.broker;resolution:=optional;version="[5.8,6.0)",
+ org.apache.activemq.ra;resolution:=optional;version="[5.8,6.0)",
+ org.apache.activemq.store;resolution:=optional;version="[5.8,6.0)",
+ org.apache.activemq.store.jdbc;resolution:=optional;version="[5.8,6.0)",
+ org.apache.activemq.store.memory;resolution:=optional;version="[5.8,6.0)",
org.apache.bval.jsr303;resolution:=optional,
org.apache.bval.jsr303.resolver;resolution:=optional,
org.apache.commons.beanutils,
@@ -463,7 +463,11 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-jdbc-store</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
Modified: tomee/tomee/trunk/examples/client-resource-lookup-preview/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/client-resource-lookup-preview/pom.xml?rev=1446172&r1=1446171&r2=1446172&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/client-resource-lookup-preview/pom.xml (original)
+++ tomee/tomee/trunk/examples/client-resource-lookup-preview/pom.xml Thu Feb 14 13:33:36 2013
@@ -69,8 +69,8 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.6.0</version>
+ <artifactId>activemq-broker</artifactId>
+ <version>5.8.0</version>
<scope>runtime</scope>
</dependency>
Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1446172&r1=1446171&r2=1446172&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Thu Feb 14 13:33:36 2013
@@ -137,7 +137,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bval.version>0.5</bval.version>
- <org.apache.activemq.version>5.7.0</org.apache.activemq.version>
+ <org.apache.activemq.version>5.8.0</org.apache.activemq.version>
<quartz.version>2.1.6</quartz.version>
<org.springframework.version>3.1.0.RELEASE</org.springframework.version>
<junit.version>4.11</junit.version>
@@ -916,6 +916,17 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-jdbc-store</artifactId>
+ <version>${org.apache.activemq.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
<version>${org.apache.activemq.version}</version>
<exclusions>
@@ -940,7 +951,7 @@
<artifactId>scala-library</artifactId>
</exclusion>
<exclusion>
- <groupId>activemq</groupId>
+ <groupId>javax.jmdns</groupId>
<artifactId>jmdns</artifactId>
</exclusion>
<exclusion>
@@ -951,7 +962,7 @@
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
</exclusion>
- <exclusion>
+ <exclusion>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
</exclusion>
@@ -961,14 +972,14 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
+ <dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>${commons-net.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
<version>${org.apache.activemq.version}</version>
<exclusions>
<exclusion>
@@ -1076,7 +1087,7 @@
<artifactId>regexp</artifactId>
</exclusion>
<exclusion>
- <groupId>activemq</groupId>
+ <groupId>javax.jmdns</groupId>
<artifactId>jmdns</artifactId>
</exclusion>
<exclusion>
@@ -1381,10 +1392,10 @@
<version>${osgi.framework.version}</version>
</dependency>
<dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.17.1-GA</version>
- </dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.17.1-GA</version>
+ </dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
@@ -1606,11 +1617,11 @@
<scope>test</scope>
</dependency>
<dependency>
- <artifactId>commons-lang3</artifactId>
+ <artifactId>commons-lang3</artifactId>
<groupId>org.apache.commons</groupId>
<version>${commons-lang3.version}</version>
</dependency>
- <dependency>
+ <dependency>
<artifactId>commons-lang</artifactId>
<groupId>commons-lang</groupId>
<version>2.6</version>
Modified: tomee/tomee/trunk/server/openejb-server/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/pom.xml?rev=1446172&r1=1446171&r2=1446172&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-server/pom.xml (original)
+++ tomee/tomee/trunk/server/openejb-server/pom.xml Thu Feb 14 13:33:36 2013
@@ -196,11 +196,11 @@
javax.xml.ws.spi,
javax.xml.ws.wsaddressing,
oracle.toplink.essentials.transaction;resolution:=optional,
- org.apache.activemq.broker;version="[5.4,6)";resolution:=optional,
- org.apache.activemq.ra;version="[5.4,6)";resolution:=optional,
- org.apache.activemq.store;version="[5.4,6)";resolution:=optional,
- org.apache.activemq.store.jdbc;version="[5.4,6)";resolution:=optional,
- org.apache.activemq.store.memory;version="[5.4,6)";resolution:=optional,
+ org.apache.activemq.broker;version="[5.8,6.0)";resolution:=optional,
+ org.apache.activemq.ra;version="[5.8,6.0)";resolution:=optional,
+ org.apache.activemq.store;version="[5.8,6.0)";resolution:=optional,
+ org.apache.activemq.store.jdbc;version="[5.8,6.0)";resolution:=optional,
+ org.apache.activemq.store.memory;version="[5.8,6.0)";resolution:=optional,
org.apache.commons.beanutils,
org.apache.commons.cli;version="[1.2,2)",
org.apache.commons.dbcp;version="[1.4,2)",
Modified: tomee/tomee/trunk/tomee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/pom.xml?rev=1446172&r1=1446171&r2=1446172&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/pom.xml (original)
+++ tomee/tomee/trunk/tomee/pom.xml Thu Feb 14 13:33:36 2013
@@ -80,7 +80,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.activemq</groupId>
@@ -129,7 +129,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.activemq</groupId>
@@ -161,7 +161,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.activemq</groupId>
Modified: tomee/tomee/trunk/tomee/tomee-plus-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-plus-webapp/pom.xml?rev=1446172&r1=1446171&r2=1446172&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-plus-webapp/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-plus-webapp/pom.xml Thu Feb 14 13:33:36 2013
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
Re: Fwd: svn commit: r1446172 - in /tomee/tomee/trunk: ./
arquillian/arquillian-tomee-common/
arquillian/arquillian-tomee-webapp-remote/ assembly/openejb-lite/
container/openejb-core/ examples/client-resource-lookup-preview/
server/openejb-server/ tomee/ tomee/...
Posted by AndyG <an...@orprovision.com>.
Sure, will do.
--
View this message in context: http://openejb.979440.n4.nabble.com/Fwd-svn-commit-r1446172-in-tomee-tomee-trunk-arquillian-arquillian-tomee-common-arquillian-arquillia-tp4660777p4660778.html
Sent from the OpenEJB Dev mailing list archive at Nabble.com.
Fwd: svn commit: r1446172 - in /tomee/tomee/trunk: ./
arquillian/arquillian-tomee-common/ arquillian/arquillian-tomee-webapp-remote/
assembly/openejb-lite/ container/openejb-core/ examples/client-resource-lookup-preview/
server/openejb-server/ tomee/ tomee/...
Posted by Romain Manni-Bucau <rm...@gmail.com>.
Hi Andy,
can you link it to a jira please?
*Romain Manni-Bucau*
*Twitter: @rmannibucau <https://twitter.com/rmannibucau>*
*Blog: **http://rmannibucau.wordpress.com/*<http://rmannibucau.wordpress.com/>
*LinkedIn: **http://fr.linkedin.com/in/rmannibucau*
*Github: https://github.com/rmannibucau*
---------- Forwarded message ----------
From: <an...@apache.org>
Date: 2013/2/14
Subject: svn commit: r1446172 - in /tomee/tomee/trunk: ./
arquillian/arquillian-tomee-common/
arquillian/arquillian-tomee-webapp-remote/ assembly/openejb-lite/
container/openejb-core/ examples/client-resource-lookup-preview/
server/openejb-server/ tomee/ tomee/...
To: commits@tomee.apache.org
Author: andygumbrecht
Date: Thu Feb 14 13:33:36 2013
New Revision: 1446172
URL: http://svn.apache.org/r1446172
Log:
ActimeMQ 5.8.0
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
tomee/tomee/trunk/assembly/openejb-lite/pom.xml
tomee/tomee/trunk/container/openejb-core/pom.xml
tomee/tomee/trunk/examples/client-resource-lookup-preview/pom.xml
tomee/tomee/trunk/pom.xml
tomee/tomee/trunk/server/openejb-server/pom.xml
tomee/tomee/trunk/tomee/pom.xml
tomee/tomee/trunk/tomee/tomee-plus-webapp/pom.xml
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml?rev=1446172&r1=1446171&r2=1446172&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml Thu Feb 14
13:33:36 2013
@@ -120,7 +120,7 @@
<groupId>org.apache.activemq</groupId>
</exclusion>
<exclusion>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
<groupId>org.apache.activemq</groupId>
</exclusion>
<exclusion>
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml?rev=1446172&r1=1446171&r2=1446172&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
(original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml Thu
Feb 14 13:33:36 2013
@@ -128,7 +128,7 @@
<groupId>org.apache.activemq</groupId>
</exclusion>
<exclusion>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
<groupId>org.apache.activemq</groupId>
</exclusion>
<exclusion>
Modified: tomee/tomee/trunk/assembly/openejb-lite/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/assembly/openejb-lite/pom.xml?rev=1446172&r1=1446171&r2=1446172&view=diff
==============================================================================
--- tomee/tomee/trunk/assembly/openejb-lite/pom.xml (original)
+++ tomee/tomee/trunk/assembly/openejb-lite/pom.xml Thu Feb 14 13:33:36 2013
@@ -78,7 +78,7 @@
<exclusions>
<exclusion>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.activemq</groupId>
Modified: tomee/tomee/trunk/container/openejb-core/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/pom.xml?rev=1446172&r1=1446171&r2=1446172&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-core/pom.xml Thu Feb 14 13:33:36
2013
@@ -114,11 +114,11 @@
javax.xml.ws.soap,
javax.xml.ws.spi,
javax.xml.ws.wsaddressing,
- org.apache.activemq.broker;resolution:=optional;version="[5.4,6)",
- org.apache.activemq.ra;resolution:=optional;version="[5.4,6)",
- org.apache.activemq.store;resolution:=optional;version="[5.4,6)",
-
org.apache.activemq.store.jdbc;resolution:=optional;version="[5.4,6)",
-
org.apache.activemq.store.memory;resolution:=optional;version="[5.4,6)",
+ org.apache.activemq.broker;resolution:=optional;version="[5.8,6.0)",
+ org.apache.activemq.ra;resolution:=optional;version="[5.8,6.0)",
+ org.apache.activemq.store;resolution:=optional;version="[5.8,6.0)",
+
org.apache.activemq.store.jdbc;resolution:=optional;version="[5.8,6.0)",
+
org.apache.activemq.store.memory;resolution:=optional;version="[5.8,6.0)",
org.apache.bval.jsr303;resolution:=optional,
org.apache.bval.jsr303.resolver;resolution:=optional,
org.apache.commons.beanutils,
@@ -463,7 +463,11 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-jdbc-store</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
Modified: tomee/tomee/trunk/examples/client-resource-lookup-preview/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/client-resource-lookup-preview/pom.xml?rev=1446172&r1=1446171&r2=1446172&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/client-resource-lookup-preview/pom.xml
(original)
+++ tomee/tomee/trunk/examples/client-resource-lookup-preview/pom.xml Thu
Feb 14 13:33:36 2013
@@ -69,8 +69,8 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.6.0</version>
+ <artifactId>activemq-broker</artifactId>
+ <version>5.8.0</version>
<scope>runtime</scope>
</dependency>
Modified: tomee/tomee/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1446172&r1=1446171&r2=1446172&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Thu Feb 14 13:33:36 2013
@@ -137,7 +137,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bval.version>0.5</bval.version>
- <org.apache.activemq.version>5.7.0</org.apache.activemq.version>
+ <org.apache.activemq.version>5.8.0</org.apache.activemq.version>
<quartz.version>2.1.6</quartz.version>
<org.springframework.version>3.1.0.RELEASE</org.springframework.version>
<junit.version>4.11</junit.version>
@@ -916,6 +916,17 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-jdbc-store</artifactId>
+ <version>${org.apache.activemq.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
<version>${org.apache.activemq.version}</version>
<exclusions>
@@ -940,7 +951,7 @@
<artifactId>scala-library</artifactId>
</exclusion>
<exclusion>
- <groupId>activemq</groupId>
+ <groupId>javax.jmdns</groupId>
<artifactId>jmdns</artifactId>
</exclusion>
<exclusion>
@@ -951,7 +962,7 @@
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
</exclusion>
- <exclusion>
+ <exclusion>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
</exclusion>
@@ -961,14 +972,14 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
+ <dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>${commons-net.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
<version>${org.apache.activemq.version}</version>
<exclusions>
<exclusion>
@@ -1076,7 +1087,7 @@
<artifactId>regexp</artifactId>
</exclusion>
<exclusion>
- <groupId>activemq</groupId>
+ <groupId>javax.jmdns</groupId>
<artifactId>jmdns</artifactId>
</exclusion>
<exclusion>
@@ -1381,10 +1392,10 @@
<version>${osgi.framework.version}</version>
</dependency>
<dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.17.1-GA</version>
- </dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.17.1-GA</version>
+ </dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
@@ -1606,11 +1617,11 @@
<scope>test</scope>
</dependency>
<dependency>
- <artifactId>commons-lang3</artifactId>
+ <artifactId>commons-lang3</artifactId>
<groupId>org.apache.commons</groupId>
<version>${commons-lang3.version}</version>
</dependency>
- <dependency>
+ <dependency>
<artifactId>commons-lang</artifactId>
<groupId>commons-lang</groupId>
<version>2.6</version>
Modified: tomee/tomee/trunk/server/openejb-server/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/pom.xml?rev=1446172&r1=1446171&r2=1446172&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-server/pom.xml (original)
+++ tomee/tomee/trunk/server/openejb-server/pom.xml Thu Feb 14 13:33:36 2013
@@ -196,11 +196,11 @@
javax.xml.ws.spi,
javax.xml.ws.wsaddressing,
oracle.toplink.essentials.transaction;resolution:=optional,
- org.apache.activemq.broker;version="[5.4,6)";resolution:=optional,
- org.apache.activemq.ra;version="[5.4,6)";resolution:=optional,
- org.apache.activemq.store;version="[5.4,6)";resolution:=optional,
-
org.apache.activemq.store.jdbc;version="[5.4,6)";resolution:=optional,
-
org.apache.activemq.store.memory;version="[5.4,6)";resolution:=optional,
+ org.apache.activemq.broker;version="[5.8,6.0)";resolution:=optional,
+ org.apache.activemq.ra;version="[5.8,6.0)";resolution:=optional,
+ org.apache.activemq.store;version="[5.8,6.0)";resolution:=optional,
+
org.apache.activemq.store.jdbc;version="[5.8,6.0)";resolution:=optional,
+
org.apache.activemq.store.memory;version="[5.8,6.0)";resolution:=optional,
org.apache.commons.beanutils,
org.apache.commons.cli;version="[1.2,2)",
org.apache.commons.dbcp;version="[1.4,2)",
Modified: tomee/tomee/trunk/tomee/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/pom.xml?rev=1446172&r1=1446171&r2=1446172&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/pom.xml (original)
+++ tomee/tomee/trunk/tomee/pom.xml Thu Feb 14 13:33:36 2013
@@ -80,7 +80,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.activemq</groupId>
@@ -129,7 +129,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.activemq</groupId>
@@ -161,7 +161,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.activemq</groupId>
Modified: tomee/tomee/trunk/tomee/tomee-plus-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-plus-webapp/pom.xml?rev=1446172&r1=1446171&r2=1446172&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-plus-webapp/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-plus-webapp/pom.xml Thu Feb 14 13:33:36
2013
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>