You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2014/12/10 16:00:26 UTC

[1/2] activemq-6 git commit: ActiveMQ6-6 Remove last of JBoss Transactions SPI

Repository: activemq-6
Updated Branches:
  refs/heads/master 2d69d9dc7 -> 60576a7c5


ActiveMQ6-6 Remove last of JBoss Transactions SPI


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

Branch: refs/heads/master
Commit: 2982f37512529bb76db9869025a92ec88a904adb
Parents: 2d69d9d
Author: Martyn Taylor <mt...@redhat.com>
Authored: Wed Dec 10 13:35:41 2014 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Wed Dec 10 14:00:34 2014 +0000

----------------------------------------------------------------------
 examples/jms/jms-bridge/pom.xml |  4 ----
 pom.xml                         | 13 -------------
 tests/jms-tests/pom.xml         |  6 +-----
 3 files changed, 1 insertion(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/2982f375/examples/jms/jms-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/pom.xml b/examples/jms/jms-bridge/pom.xml
index 689f8bf..f014b5b 100644
--- a/examples/jms/jms-bridge/pom.xml
+++ b/examples/jms/jms-bridge/pom.xml
@@ -24,10 +24,6 @@
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss</groupId>
-         <artifactId>jboss-transaction-spi</artifactId>
-      </dependency>
-      <dependency>
          <groupId>org.jboss.jbossts.jts</groupId>
          <artifactId>jbossjts-jacorb</artifactId>
       </dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/2982f375/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 29c3688..315865f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -226,19 +226,6 @@
             <version>1.1.1</version>
          </dependency>
 
-         <!--this specifically for the JMS Bridge-->
-         <dependency>
-            <groupId>org.jboss</groupId>
-            <artifactId>jboss-transaction-spi</artifactId>
-            <version>7.0.0.Final</version>
-            <exclusions>
-               <exclusion>
-                  <groupId>org.jboss.logging</groupId>
-                  <artifactId>jboss-logging-spi</artifactId>
-               </exclusion>
-            </exclusions>
-         </dependency>
-
          <!--this for xa recovery-->
          <dependency>
             <groupId>org.jboss.jbossts.jts</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/2982f375/tests/jms-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml
index 287a0da..5146df1 100644
--- a/tests/jms-tests/pom.xml
+++ b/tests/jms-tests/pom.xml
@@ -86,11 +86,7 @@
          <groupId>org.apache.geronimo.specs</groupId>
          <artifactId>geronimo-ejb_3.0_spec</artifactId>
       </dependency>
-      <!--this specifically for the JMS Bridge -->
-      <dependency>
-         <groupId>org.jboss</groupId>
-         <artifactId>jboss-transaction-spi</artifactId>
-      </dependency>
+
       <dependency>
          <groupId>org.apache.geronimo.components</groupId>
          <artifactId>geronimo-jaspi</artifactId>


[2/2] activemq-6 git commit: Merging #39 on Transaction Manager dependencies

Posted by cl...@apache.org.
Merging #39 on Transaction Manager dependencies


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

Branch: refs/heads/master
Commit: 60576a7c514349d9b8e01c46f4f0bae3af35daa5
Parents: 2d69d9d 2982f37
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Dec 10 10:00:03 2014 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Dec 10 10:00:03 2014 -0500

----------------------------------------------------------------------
 examples/jms/jms-bridge/pom.xml |  4 ----
 pom.xml                         | 13 -------------
 tests/jms-tests/pom.xml         |  6 +-----
 3 files changed, 1 insertion(+), 22 deletions(-)
----------------------------------------------------------------------