activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/2] activemq-6 git commit: ACTIVEMQ6-5 Replace 3rd party CatX deps with CatA
Date Tue, 18 Nov 2014 19:20:26 GMT
Repository: activemq-6
Updated Branches:
  refs/heads/master b5d695f03 -> 886180293


ACTIVEMQ6-5 Replace 3rd party CatX deps with CatA


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/176e8178
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/176e8178
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/176e8178

Branch: refs/heads/master
Commit: 176e8178050a7228ab1fb606b941efdffbe4b109
Parents: b5d695f
Author: Martyn Taylor <mtaylor@redhat.com>
Authored: Mon Nov 17 12:40:04 2014 +0000
Committer: Martyn Taylor <mtaylor@redhat.com>
Committed: Tue Nov 18 17:33:52 2014 +0000

----------------------------------------------------------------------
 activemq-jms-server/pom.xml                     |  4 +-
 activemq-ra/pom.xml                             |  8 ++--
 examples/javaee/pom.xml                         |  2 +-
 examples/jms/activemq-ra-rar/pom.xml            |  4 +-
 examples/jms/xa-with-jta/pom.xml                |  4 +-
 .../activemq-jboss-as-integration/pom.xml       |  4 +-
 pom.xml                                         | 47 +++++++++-----------
 tests/byteman-tests/pom.xml                     | 16 +++----
 tests/integration-tests/pom.xml                 |  4 +-
 tests/jms-tests/pom.xml                         | 16 +++----
 tests/joram-tests/pom.xml                       | 16 +++----
 tests/performance-tests/pom.xml                 | 16 +++----
 tests/soak-tests/pom.xml                        | 16 +++----
 tests/stress-tests/pom.xml                      | 16 +++----
 tests/timing-tests/pom.xml                      | 16 +++----
 tests/unit-tests/pom.xml                        |  9 +++-
 16 files changed, 84 insertions(+), 114 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/176e8178/activemq-jms-server/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-jms-server/pom.xml b/activemq-jms-server/pom.xml
index 0345d05..26ac847 100644
--- a/activemq-jms-server/pom.xml
+++ b/activemq-jms-server/pom.xml
@@ -41,8 +41,8 @@
          <artifactId>jboss-jms-api_2.0_spec</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.transaction</groupId>
-         <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-ejb_3.0_spec</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.jbossts.jts</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/176e8178/activemq-ra/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index 871fed3..a31d51c 100644
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -48,8 +48,8 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-jca-api</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
@@ -58,8 +58,8 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.transaction</groupId>
-         <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-ejb_3.0_spec</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/176e8178/examples/javaee/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/pom.xml b/examples/javaee/pom.xml
index 401082d..5f724f9 100644
--- a/examples/javaee/pom.xml
+++ b/examples/javaee/pom.xml
@@ -24,7 +24,7 @@
       <jboss.home>${env.JBOSS_HOME}</jboss.home>
 
       <!-- Note this must be consistent with the version in AS7 -->
-      <hornetq.client.version>2.5.0-SNAPSHOT</hornetq.client.version>
+      <hornetq.client.version>6.0.0-SNAPSHOT</hornetq.client.version>
 
    </properties>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/176e8178/examples/jms/activemq-ra-rar/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/activemq-ra-rar/pom.xml b/examples/jms/activemq-ra-rar/pom.xml
index b8fba56..25e4070 100644
--- a/examples/jms/activemq-ra-rar/pom.xml
+++ b/examples/jms/activemq-ra-rar/pom.xml
@@ -31,8 +31,8 @@
                <artifactId>jboss-jms-api_2.0_spec</artifactId>
             </exclusion>
             <exclusion>
-               <groupId>org.jboss.spec.javax.transaction</groupId>
-               <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+               <groupId>org.apache.geronimo.specs</groupId>
+               <artifactId>geronimo-ejb_3.0_spec</artifactId>
             </exclusion>
             <exclusion>
                <groupId>jboss.jbossts.jts</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/176e8178/examples/jms/xa-with-jta/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-with-jta/pom.xml b/examples/jms/xa-with-jta/pom.xml
index 29cd849..8753828 100644
--- a/examples/jms/xa-with-jta/pom.xml
+++ b/examples/jms/xa-with-jta/pom.xml
@@ -23,8 +23,8 @@
          <artifactId>jboss-jms-api_2.0_spec</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.transaction</groupId>
-         <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-ejb_3.0_spec</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.jbossts</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/176e8178/integration/activemq-jboss-as-integration/pom.xml
----------------------------------------------------------------------
diff --git a/integration/activemq-jboss-as-integration/pom.xml b/integration/activemq-jboss-as-integration/pom.xml
index 677112c..1512c61 100644
--- a/integration/activemq-jboss-as-integration/pom.xml
+++ b/integration/activemq-jboss-as-integration/pom.xml
@@ -44,8 +44,8 @@
          <artifactId>jbosssx</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.transaction</groupId>
-         <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-ejb_3.0_spec</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/176e8178/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8a4ae73..c418b60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,6 +184,7 @@
             <artifactId>javacc</artifactId>
             <version>4.0</version>
          </dependency>
+
          <!-- needed to compile JMS-->
          <dependency>
             <groupId>org.jboss.spec.javax.jms</groupId>
@@ -205,15 +206,16 @@
 
          <!-- needed to compile JavaEE examples-->
          <dependency>
-            <groupId>org.jboss.javaee</groupId>
-            <artifactId>jboss-ejb-api</artifactId>
-            <version>3.0.0.GA</version>
-         </dependency>
+             <groupId>org.apache.geronimo.specs</groupId>
+             <artifactId>geronimo-ejb_3.0_spec</artifactId>
+             <version>1.0.1</version>
+	      </dependency>
          <dependency>
-            <groupId>org.jboss.spec.javax.transaction</groupId>
-            <artifactId>jboss-transaction-api_1.2_spec</artifactId>
-            <version>1.0.0.Final</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <version>1.1.1</version>
          </dependency>
+
          <!--this specifically for the JMS Bridge-->
          <dependency>
             <groupId>org.jboss</groupId>
@@ -226,6 +228,7 @@
                </exclusion>
             </exclusions>
          </dependency>
+
          <!--this for xa recovery-->
          <dependency>
             <groupId>org.jboss.jbossts.jts</groupId>
@@ -253,7 +256,7 @@
          <dependency>
             <groupId>org.jgroups</groupId>
             <artifactId>jgroups</artifactId>
-            <version>3.3.4.Final</version>
+            <version>3.6.0.Final</version>
          </dependency>
         <dependency>
             <groupId>io.airlift</groupId>
@@ -361,12 +364,14 @@
             <!-- There are newer versions of the JUnit but they break our tests -->
             <version>4.11</version>
          </dependency>
+
          <!--needed to compile the jms tests -->
          <dependency>
-            <groupId>org.jboss.javaee</groupId>
-            <artifactId>jboss-jaspi-api</artifactId>
-            <version>1.0.0.GA</version>
+	         <groupId>org.apache.geronimo.components</groupId>
+	         <artifactId>geronimo-jaspi</artifactId>
+	         <version>2.0.0</version>
          </dependency>
+
          <!--needed to run the jms tests -->
          <dependency>
             <groupId>org.jboss.naming</groupId>
@@ -380,11 +385,6 @@
             </exclusions>
          </dependency>
          <dependency>
-            <groupId>jboss.jbossts</groupId>
-            <artifactId>jbossts-common</artifactId>
-            <version>4.6.1.GA</version>
-         </dependency>
-         <dependency>
             <groupId>apache-logging</groupId>
             <artifactId>commons-logging</artifactId>
             <version>1.1.0.jboss</version>
@@ -398,17 +398,10 @@
          </dependency>
 
          <dependency>
-            <groupId>org.jboss.javaee</groupId>
-            <artifactId>jboss-jca-api</artifactId>
-            <version>1.5.0.GA</version>
-            <exclusions>
-               <exclusion>
-                  <groupId>org.jboss.logging</groupId>
-                  <artifactId>jboss-logging-spi</artifactId>
-               </exclusion>
-            </exclusions>
+         <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+            <version>2.0.0</version>
          </dependency>
-
          <!-- needed for javadoc graphics-->
          <dependency>
             <groupId>org.jboss.apiviz</groupId>
@@ -490,7 +483,7 @@
             <module>activemq-rest</module>
             <module>activemq-service-sar</module>
             <module>activemq-tools</module>
-            <module>integration/activemq-jboss-as-integration</module>
+            <!-- <module>integration/activemq-jboss-as-integration</module>
-->
             <module>integration/activemq-spring-integration</module>
             <module>integration/activemq-twitter-integration</module>
             <module>integration/activemq-aerogear-integration</module>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/176e8178/tests/byteman-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/byteman-tests/pom.xml b/tests/byteman-tests/pom.xml
index 221f085..192f9a5 100644
--- a/tests/byteman-tests/pom.xml
+++ b/tests/byteman-tests/pom.xml
@@ -107,8 +107,8 @@
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-jca-api</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.security</groupId>
@@ -123,16 +123,12 @@
          <artifactId>jnpserver</artifactId>
       </dependency>
       <dependency>
-         <groupId>jboss.jbossts</groupId>
-         <artifactId>jbossts-common</artifactId>
-      </dependency>
-      <dependency>
          <groupId>apache-logging</groupId>
          <artifactId>commons-logging</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.transaction</groupId>
-         <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-ejb_3.0_spec</artifactId>
       </dependency>
       <!--this specifically for the JMS Bridge -->
       <dependency>
@@ -140,8 +136,8 @@
          <artifactId>jboss-transaction-spi</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-jaspi-api</artifactId>
+         <groupId>org.apache.geronimo.components</groupId>
+         <artifactId>geronimo-jaspi</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.spec.javax.jms</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/176e8178/tests/integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index 34f60b5..5ab98b4 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -110,8 +110,8 @@
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-jca-api</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.security</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/176e8178/tests/jms-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml
index 6be5488..8e0e625 100644
--- a/tests/jms-tests/pom.xml
+++ b/tests/jms-tests/pom.xml
@@ -63,8 +63,8 @@
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-jca-api</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.security</groupId>
@@ -83,16 +83,12 @@
          <artifactId>jnpserver</artifactId>
       </dependency>
       <dependency>
-         <groupId>jboss.jbossts</groupId>
-         <artifactId>jbossts-common</artifactId>
-      </dependency>
-      <dependency>
          <groupId>apache-logging</groupId>
          <artifactId>commons-logging</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.transaction</groupId>
-         <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-ejb_3.0_spec</artifactId>
       </dependency>
       <!--this specifically for the JMS Bridge -->
       <dependency>
@@ -100,8 +96,8 @@
          <artifactId>jboss-transaction-spi</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-jaspi-api</artifactId>
+         <groupId>org.apache.geronimo.components</groupId>
+         <artifactId>geronimo-jaspi</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.spec.javax.jms</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/176e8178/tests/joram-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/joram-tests/pom.xml b/tests/joram-tests/pom.xml
index 8636ffe..eb4397e 100644
--- a/tests/joram-tests/pom.xml
+++ b/tests/joram-tests/pom.xml
@@ -47,8 +47,8 @@
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-jca-api</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.security</groupId>
@@ -67,16 +67,12 @@
          <artifactId>jnpserver</artifactId>
       </dependency>
       <dependency>
-         <groupId>jboss.jbossts</groupId>
-         <artifactId>jbossts-common</artifactId>
-      </dependency>
-      <dependency>
          <groupId>apache-logging</groupId>
          <artifactId>commons-logging</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.transaction</groupId>
-         <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-ejb_3.0_spec</artifactId>
       </dependency>
       <!--this specifically for the JMS Bridge -->
       <dependency>
@@ -84,8 +80,8 @@
          <artifactId>jboss-transaction-spi</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-jaspi-api</artifactId>
+         <groupId>org.apache.geronimo.components</groupId>
+         <artifactId>geronimo-jaspi</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.spec.javax.jms</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/176e8178/tests/performance-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/performance-tests/pom.xml b/tests/performance-tests/pom.xml
index 5c66b12..d205793 100644
--- a/tests/performance-tests/pom.xml
+++ b/tests/performance-tests/pom.xml
@@ -73,8 +73,8 @@
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-jca-api</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       </dependency>
       <dependency>
          <groupId>junit</groupId>
@@ -85,12 +85,8 @@
          <artifactId>jnpserver</artifactId>
       </dependency>
       <dependency>
-         <groupId>jboss.jbossts</groupId>
-         <artifactId>jbossts-common</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.spec.javax.transaction</groupId>
-         <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-ejb_3.0_spec</artifactId>
       </dependency>
       <!--this specifically for the JMS Bridge-->
       <dependency>
@@ -98,8 +94,8 @@
          <artifactId>jboss-transaction-spi</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-jaspi-api</artifactId>
+         <groupId>org.apache.geronimo.components</groupId>
+         <artifactId>geronimo-jaspi</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.spec.javax.jms</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/176e8178/tests/soak-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/soak-tests/pom.xml b/tests/soak-tests/pom.xml
index 9742f88..7078702 100644
--- a/tests/soak-tests/pom.xml
+++ b/tests/soak-tests/pom.xml
@@ -80,8 +80,8 @@
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-jca-api</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.security</groupId>
@@ -100,16 +100,12 @@
          <artifactId>jnpserver</artifactId>
       </dependency>
       <dependency>
-         <groupId>jboss.jbossts</groupId>
-         <artifactId>jbossts-common</artifactId>
-      </dependency>
-      <dependency>
          <groupId>apache-logging</groupId>
          <artifactId>commons-logging</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.transaction</groupId>
-         <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-ejb_3.0_spec</artifactId>
       </dependency>
       <!--this specifically for the JMS Bridge-->
       <dependency>
@@ -117,8 +113,8 @@
          <artifactId>jboss-transaction-spi</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-jaspi-api</artifactId>
+         <groupId>org.apache.geronimo.components</groupId>
+         <artifactId>geronimo-jaspi</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.spec.javax.jms</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/176e8178/tests/stress-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/stress-tests/pom.xml b/tests/stress-tests/pom.xml
index d9b896f..9339bd3 100644
--- a/tests/stress-tests/pom.xml
+++ b/tests/stress-tests/pom.xml
@@ -80,8 +80,8 @@
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-jca-api</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.security</groupId>
@@ -100,16 +100,12 @@
          <artifactId>jnpserver</artifactId>
       </dependency>
       <dependency>
-         <groupId>jboss.jbossts</groupId>
-         <artifactId>jbossts-common</artifactId>
-      </dependency>
-      <dependency>
          <groupId>apache-logging</groupId>
          <artifactId>commons-logging</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.transaction</groupId>
-         <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-ejb_3.0_spec</artifactId>
       </dependency>
       <!--this specifically for the JMS Bridge-->
       <dependency>
@@ -117,8 +113,8 @@
          <artifactId>jboss-transaction-spi</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-jaspi-api</artifactId>
+         <groupId>org.apache.geronimo.components</groupId>
+         <artifactId>geronimo-jaspi</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.spec.javax.jms</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/176e8178/tests/timing-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/timing-tests/pom.xml b/tests/timing-tests/pom.xml
index 7042748..6c14f78 100644
--- a/tests/timing-tests/pom.xml
+++ b/tests/timing-tests/pom.xml
@@ -62,8 +62,8 @@
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-jca-api</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.security</groupId>
@@ -82,12 +82,8 @@
          <artifactId>jnpserver</artifactId>
       </dependency>
       <dependency>
-         <groupId>jboss.jbossts</groupId>
-         <artifactId>jbossts-common</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.spec.javax.transaction</groupId>
-         <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-ejb_3.0_spec</artifactId>
       </dependency>
       <!--this specifically for the JMS Bridge-->
       <dependency>
@@ -95,8 +91,8 @@
          <artifactId>jboss-transaction-spi</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-jaspi-api</artifactId>
+         <groupId>org.apache.geronimo.components</groupId>
+         <artifactId>geronimo-jaspi</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.spec.javax.jms</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/176e8178/tests/unit-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/unit-tests/pom.xml b/tests/unit-tests/pom.xml
index 82a6114..28dd063 100644
--- a/tests/unit-tests/pom.xml
+++ b/tests/unit-tests/pom.xml
@@ -51,8 +51,8 @@
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-jca-api</artifactId>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.security</groupId>
@@ -63,6 +63,11 @@
          <artifactId>jbosssx</artifactId>
       </dependency>
       <dependency>
+         <groupId>org.jboss.security</groupId>
+         <artifactId>jbosssx</artifactId>
+         <version>2.0.3.SP1</version>
+      </dependency>
+      <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>
       </dependency>


Mime
View raw message