Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ACTIVEMQ6-5 Replace 3rd party CatX deps with CatA

This commit is contained in:
Martyn Taylor 2014-11-17 12:40:04 +00:00
parent b5d695f030
commit 176e817805
16 changed files with 84 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq-jms-server/pom.xml
View File

@ -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>

8
activemq-ra/pom.xml
View File

@ -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>

2
examples/javaee/pom.xml
View File

@ -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>

4
examples/jms/activemq-ra-rar/pom.xml
View File

@ -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>

4
examples/jms/xa-with-jta/pom.xml
View File

@ -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>

4
integration/activemq-jboss-as-integration/pom.xml
View File

@ -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>

47
pom.xml
View File

@ -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>
@ -379,11 +384,6 @@
</exclusion>
</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>
@ -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>

16
tests/byteman-tests/pom.xml
View File

@ -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>
@ -122,17 +122,13 @@
<groupId>org.jboss.naming</groupId>
<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>

4
tests/integration-tests/pom.xml
View File

@ -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>

16
tests/jms-tests/pom.xml
View File

@ -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>
@ -82,17 +82,13 @@
<groupId>org.jboss.naming</groupId>
<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>

16
tests/joram-tests/pom.xml
View File

@ -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>
@ -66,17 +66,13 @@
<groupId>org.jboss.naming</groupId>
<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>

16
tests/performance-tests/pom.xml
View File

@ -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>

16
tests/soak-tests/pom.xml
View File

@ -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>
@ -99,17 +99,13 @@
<groupId>org.jboss.naming</groupId>
<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>

16
tests/stress-tests/pom.xml
View File

@ -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>
@ -99,17 +99,13 @@
<groupId>org.jboss.naming</groupId>
<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>

16
tests/timing-tests/pom.xml
View File

@ -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>

9
tests/unit-tests/pom.xml
View File

@ -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>
@ -62,6 +62,11 @@
<groupId>org.jboss.security</groupId>
<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>