ARTEMIS-1510 refactor Maven poms Clean up unused declared dependencies and undeclared dependencies which are pulled in transitively.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/55d7260a Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/55d7260a Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/55d7260a Branch: refs/heads/master Commit: 55d7260a075975f9093cafad82bd6a4d56e16c15 Parents: fd2ce26 Author: Justin Bertram <jbert...@apache.org> Authored: Tue Oct 31 08:19:00 2017 -0500 Committer: Clebert Suconic <clebertsuco...@apache.org> Committed: Mon Nov 13 17:03:35 2017 -0500 ---------------------------------------------------------------------- artemis-cdi-client/pom.xml | 220 ++++++++------- artemis-cli/pom.xml | 72 +++-- artemis-commons/pom.xml | 6 + artemis-core-client/pom.xml | 32 +++ artemis-dto/pom.xml | 8 - artemis-features/pom.xml | 18 +- artemis-jdbc-store/pom.xml | 40 ++- artemis-jms-server/pom.xml | 29 +- artemis-journal/pom.xml | 14 + artemis-junit/pom.xml | 25 +- artemis-maven-plugin/pom.xml | 24 +- artemis-native/pom.xml | 6 + artemis-protocols/artemis-amqp-protocol/pom.xml | 42 ++- .../artemis-hornetq-protocol/pom.xml | 45 ++- .../artemis-hqclient-protocol/pom.xml | 24 +- artemis-protocols/artemis-mqtt-protocol/pom.xml | 51 +++- .../artemis-openwire-protocol/pom.xml | 54 +++- .../artemis-stomp-protocol/pom.xml | 40 ++- artemis-ra/pom.xml | 35 +-- artemis-rest/pom.xml | 61 +++- artemis-selector/pom.xml | 8 +- artemis-server-osgi/pom.xml | 22 +- artemis-server/pom.xml | 77 ++++- artemis-service-extensions/pom.xml | 40 +-- artemis-tools/pom.xml | 4 +- artemis-web/pom.xml | 57 ++-- .../standard/spring-integration/pom.xml | 4 + integration/activemq-spring-integration/pom.xml | 26 -- .../artemis/spring/ActiveMQSpringBundle.java | 31 --- .../artemis/spring/ActiveMQSpringLogger.java | 38 --- pom.xml | 40 ++- tests/artemis-test-support/pom.xml | 26 +- tests/extra-tests/pom.xml | 38 +-- tests/integration-tests/pom.xml | 278 +++++++++++-------- tests/jms-tests/pom.xml | 45 +-- tests/joram-tests/pom.xml | 51 ++-- tests/performance-tests/pom.xml | 73 ++--- tests/smoke-tests/pom.xml | 47 +--- tests/soak-tests/pom.xml | 54 +--- tests/stress-tests/pom.xml | 60 ++-- tests/timing-tests/pom.xml | 51 ++-- tests/unit-tests/pom.xml | 49 +++- 42 files changed, 1185 insertions(+), 780 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-cdi-client/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-cdi-client/pom.xml b/artemis-cdi-client/pom.xml index 39f344f..4c9783e 100644 --- a/artemis-cdi-client/pom.xml +++ b/artemis-cdi-client/pom.xml @@ -19,101 +19,133 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <parent> - <artifactId>artemis-pom</artifactId> - <groupId>org.apache.activemq</groupId> - <version>2.5.0-SNAPSHOT</version> - <relativePath>..</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>artemis-pom</artifactId> + <groupId>org.apache.activemq</groupId> + <version>2.5.0-SNAPSHOT</version> + <relativePath>..</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> - <properties> - <activemq.basedir>${project.basedir}/..</activemq.basedir> - </properties> + <properties> + <activemq.basedir>${project.basedir}/..</activemq.basedir> + </properties> - <artifactId>artemis-cdi-client</artifactId> - <name>ActiveMQ Artemis CDI Integration</name> + <artifactId>artemis-cdi-client</artifactId> + <name>ActiveMQ Artemis CDI Integration</name> - <dependencies> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-processor</artifactId> - <scope>provided</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging</artifactId> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>artemis-jms-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>artemis-jms-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.logmanager</groupId> - <artifactId>jboss-logmanager</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.junit</groupId> - <artifactId>arquillian-junit-container</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - </dependencies> - <profiles> - <profile> - <id>Weld</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.weld.se</groupId> - <artifactId>weld-se</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.container</groupId> - <artifactId>arquillian-weld-embedded</artifactId> - </dependency> - </dependencies> - </profile> - <profile> - <id>OWB</id> - <dependencies> - <dependency> - <groupId>org.apache.openwebbeans</groupId> - <artifactId>openwebbeans-impl</artifactId> - </dependency> - <dependency> - <groupId>org.apache.openwebbeans</groupId> - <artifactId>openwebbeans-spi</artifactId> - </dependency> - <dependency> - <groupId>org.apache.openwebbeans</groupId> - <artifactId>openwebbeans-resource</artifactId> - </dependency> - <dependency> - <groupId>org.apache.openwebbeans.arquillian</groupId> - <artifactId>owb-arquillian-standalone</artifactId> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.2_spec</artifactId> - </dependency> - </dependencies> - </profile> - </profiles> + <dependencies> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-processor</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-annotations</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.logmanager</groupId> + <artifactId>jboss-logmanager</artifactId> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-core-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-jms-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-jms-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.junit</groupId> + <artifactId>arquillian-junit-core</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_2.0_spec</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.shrinkwrap</groupId> + <artifactId>shrinkwrap-api</artifactId> + <version>1.2.6</version> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.junit</groupId> + <artifactId>arquillian-junit-container</artifactId> + </dependency> + </dependencies> + <profiles> + <profile> + <id>Weld</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.weld.se</groupId> + <artifactId>weld-se</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-weld-embedded</artifactId> + </dependency> + </dependencies> + </profile> + <profile> + <id>OWB</id> + <dependencies> + <dependency> + <groupId>org.apache.openwebbeans</groupId> + <artifactId>openwebbeans-impl</artifactId> + </dependency> + <dependency> + <groupId>org.apache.openwebbeans</groupId> + <artifactId>openwebbeans-spi</artifactId> + </dependency> + <dependency> + <groupId>org.apache.openwebbeans</groupId> + <artifactId>openwebbeans-resource</artifactId> + </dependency> + <dependency> + <groupId>org.apache.openwebbeans.arquillian</groupId> + <artifactId>owb-arquillian-standalone</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.2_spec</artifactId> + </dependency> + </dependencies> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-cli/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-cli/pom.xml b/artemis-cli/pom.xml index b707298..775fe2d 100644 --- a/artemis-cli/pom.xml +++ b/artemis-cli/pom.xml @@ -35,6 +35,31 @@ <dependencies> <dependency> <groupId>org.apache.activemq</groupId> + <artifactId>artemis-jms-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-commons</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-core-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-journal</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-native</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> <artifactId>artemis-server</artifactId> <version>${project.version}</version> </dependency> @@ -54,19 +79,36 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_2.0_spec</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-json_1.0_spec</artifactId> + </dependency> + <dependency> <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-processor</artifactId> + <artifactId>jboss-logging-annotations</artifactId> <scope>provided</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging</artifactId> + <artifactId>jboss-logging-processor</artifactId> + <scope>provided</scope> + <optional>true</optional> </dependency> <dependency> - <groupId>org.jboss.logmanager</groupId> - <artifactId>jboss-logmanager</artifactId> - <scope>test</scope> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> </dependency> <dependency> <groupId>io.airlift</groupId> @@ -101,31 +143,11 @@ </dependency> <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>artemis-amqp-protocol</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>artemis-stomp-protocol</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>artemis-openwire-protocol</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> <artifactId>artemis-commons</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> </dependency> - - </dependencies> <build> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-commons/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-commons/pom.xml b/artemis-commons/pom.xml index c566fb8..3449b48 100644 --- a/artemis-commons/pom.xml +++ b/artemis-commons/pom.xml @@ -39,6 +39,12 @@ <optional>true</optional> </dependency> <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-annotations</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> <groupId>org.jboss.logmanager</groupId> <artifactId>jboss-logmanager</artifactId> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-core-client/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-core-client/pom.xml b/artemis-core-client/pom.xml index dc9fd1e..6d3d39c 100644 --- a/artemis-core-client/pom.xml +++ b/artemis-core-client/pom.xml @@ -40,6 +40,12 @@ </dependency> <dependency> <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-annotations</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> <scope>provided</scope> <optional>true</optional> @@ -65,6 +71,12 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + <version>1.3</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-json_1.0_spec</artifactId> </dependency> @@ -86,6 +98,26 @@ <groupId>io.netty</groupId> <artifactId>netty-codec-http</artifactId> </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-buffer</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-common</artifactId> + </dependency> </dependencies> <profiles> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-dto/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-dto/pom.xml b/artemis-dto/pom.xml index f875957..05de601 100644 --- a/artemis-dto/pom.xml +++ b/artemis-dto/pom.xml @@ -31,14 +31,6 @@ <activemq.basedir>${project.basedir}/..</activemq.basedir> </properties> - <dependencies> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>artemis-commons</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <build> <resources> <resource> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-features/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-features/pom.xml b/artemis-features/pom.xml index 9d14abc..e57e00d 100644 --- a/artemis-features/pom.xml +++ b/artemis-features/pom.xml @@ -29,15 +29,15 @@ <karaf.version>4.1.1</karaf.version> </properties> - <dependencies> - <dependency> - <groupId>org.apache.karaf.features</groupId> - <artifactId>framework</artifactId> - <version>${karaf.version}</version> - <type>kar</type> - <scope>provided</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.apache.karaf.features</groupId> + <artifactId>framework</artifactId> + <version>${karaf.version}</version> + <type>kar</type> + <scope>provided</scope> + </dependency> + </dependencies> <build> <resources> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-jdbc-store/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-jdbc-store/pom.xml b/artemis-jdbc-store/pom.xml index 738f2d0..a820a15 100644 --- a/artemis-jdbc-store/pom.xml +++ b/artemis-jdbc-store/pom.xml @@ -41,54 +41,52 @@ <optional>true</optional> </dependency> <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>artemis-commons</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <type>test-jar</type> - </dependency> - - <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> </dependency> - <dependency> <groupId>org.jboss.logmanager</groupId> <artifactId>jboss-logmanager</artifactId> <scope>test</scope> </dependency> - - <!-- Database driver support --> <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <scope>test</scope> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-commons</artifactId> + <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.postgresql</groupId> - <artifactId>postgresql</artifactId> - <scope>provided</scope> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-commons</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <type>test-jar</type> </dependency> - <dependency> <groupId>org.apache.activemq</groupId> <artifactId>artemis-journal</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>org.apache.activemq</groupId> <artifactId>artemis-core-client</artifactId> <version>${project.version}</version> </dependency> + <!-- Database driver support --> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> - </dependencies> </project> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-jms-server/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-jms-server/pom.xml b/artemis-jms-server/pom.xml index a44fd6e..489ac4f 100644 --- a/artemis-jms-server/pom.xml +++ b/artemis-jms-server/pom.xml @@ -39,6 +39,16 @@ <optional>true</optional> </dependency> <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-annotations</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + </dependency> + <dependency> <groupId>org.apache.activemq</groupId> <artifactId>artemis-core-client</artifactId> <version>${project.version}</version> @@ -55,30 +65,31 @@ </dependency> <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>artemis-service-extensions</artifactId> + <artifactId>artemis-journal</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_2.0_spec</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-commons</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-service-extensions</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-ejb_3.0_spec</artifactId> + <artifactId>geronimo-jms_2.0_spec</artifactId> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jta_1.1_spec</artifactId> - <version>1.1.1</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-json_1.0_spec</artifactId> </dependency> - <dependency> - <groupId>org.apache.johnzon</groupId> - <artifactId>johnzon-core</artifactId> - </dependency> </dependencies> <profiles> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-journal/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-journal/pom.xml b/artemis-journal/pom.xml index f7e1ee6..5b493ef 100644 --- a/artemis-journal/pom.xml +++ b/artemis-journal/pom.xml @@ -38,6 +38,12 @@ <scope>provided</scope> <optional>true</optional> </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-annotations</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> <!-- JBoss Logging @@ -61,6 +67,14 @@ <artifactId>artemis-native</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-buffer</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-common</artifactId> + </dependency> <!-- needed to compile the tests --> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-junit/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-junit/pom.xml b/artemis-junit/pom.xml index b3254dd..edc2d0a 100644 --- a/artemis-junit/pom.xml +++ b/artemis-junit/pom.xml @@ -41,8 +41,8 @@ <!-- --> <dependency> - <groupId>org.jboss.logmanager</groupId> - <artifactId>jboss-logmanager</artifactId> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> </dependency> <dependency> <groupId>org.apache.activemq</groupId> @@ -54,15 +54,30 @@ <artifactId>artemis-jms-client</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-core-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-commons</artifactId> + <version>${project.version}</version> + </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_2.0_spec</artifactId> </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> + <artifactId>slf4j-api</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-maven-plugin/pom.xml b/artemis-maven-plugin/pom.xml index 01f85ea..d1a330d 100644 --- a/artemis-maven-plugin/pom.xml +++ b/artemis-maven-plugin/pom.xml @@ -38,33 +38,33 @@ <version>3.3.3</version> </dependency> <dependency> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.0</version> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>3.3.3</version> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-api</artifactId> - <version>1.0.2.v20150114</version> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>2.0.8</version> </dependency> <dependency> <groupId>org.eclipse.aether</groupId> - <artifactId>aether-util</artifactId> + <artifactId>aether-api</artifactId> <version>1.0.2.v20150114</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>artemis-server</artifactId> + <artifactId>artemis-boot</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>artemis-jms-server</artifactId> + <artifactId>artemis-commons</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>artemis-boot</artifactId> + <artifactId>artemis-jms-client</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -73,8 +73,8 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_2.0_spec</artifactId> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-native/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-native/pom.xml b/artemis-native/pom.xml index 9834f90..5d59498 100644 --- a/artemis-native/pom.xml +++ b/artemis-native/pom.xml @@ -33,6 +33,12 @@ <scope>provided</scope> <optional>true</optional> </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-annotations</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> <dependency> <groupId>org.jboss.logging</groupId> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-protocols/artemis-amqp-protocol/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-protocols/artemis-amqp-protocol/pom.xml b/artemis-protocols/artemis-amqp-protocol/pom.xml index 2a956d1..30200a1 100644 --- a/artemis-protocols/artemis-amqp-protocol/pom.xml +++ b/artemis-protocols/artemis-amqp-protocol/pom.xml @@ -15,14 +15,16 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <artifactId>artemis-protocols</artifactId> <groupId>org.apache.activemq</groupId> <version>2.5.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>artemis-amqp-protocol</artifactId> + <packaging>bundle</packaging> <name>ActiveMQ Artemis AMQP Protocol</name> <properties> @@ -38,6 +40,11 @@ </dependency> <dependency> <groupId>org.apache.activemq</groupId> + <artifactId>artemis-selector</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> <artifactId>artemis-core-client</artifactId> <version>${project.version}</version> </dependency> @@ -47,6 +54,12 @@ <scope>provided</scope> <optional>true</optional> </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-annotations</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> <!-- JBoss Logging @@ -75,10 +88,20 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-journal</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.apache.qpid</groupId> <artifactId>proton-j</artifactId> </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_2.0_spec</artifactId> <scope>provided</scope> @@ -88,10 +111,17 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - - + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-buffer</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport</artifactId> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.cmpn</artifactId> + </dependency> </dependencies> - - - <packaging>bundle</packaging> </project> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-protocols/artemis-hornetq-protocol/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-protocols/artemis-hornetq-protocol/pom.xml b/artemis-protocols/artemis-hornetq-protocol/pom.xml index 9b77ebd..640be9c 100644 --- a/artemis-protocols/artemis-hornetq-protocol/pom.xml +++ b/artemis-protocols/artemis-hornetq-protocol/pom.xml @@ -15,12 +15,13 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <artifactId>artemis-protocols</artifactId> <groupId>org.apache.activemq</groupId> <version>2.5.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>artemis-hornetq-protocol</artifactId> <packaging>bundle</packaging> @@ -32,29 +33,47 @@ <dependencies> <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-processor</artifactId> - <scope>provided</scope> - <optional>true</optional> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-server</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-commons</artifactId> + </exclusion> + </exclusions> </dependency> - - <!-- - JBoss Logging - --> <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-hqclient-protocol</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>artemis-server</artifactId> + <artifactId>artemis-core-client</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>artemis-hqclient-protocol</artifactId> + <artifactId>artemis-commons</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.cmpn</artifactId> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-protocols/artemis-hqclient-protocol/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-protocols/artemis-hqclient-protocol/pom.xml b/artemis-protocols/artemis-hqclient-protocol/pom.xml index 75eec2f..438e0a3 100644 --- a/artemis-protocols/artemis-hqclient-protocol/pom.xml +++ b/artemis-protocols/artemis-hqclient-protocol/pom.xml @@ -15,12 +15,13 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <artifactId>artemis-protocols</artifactId> <groupId>org.apache.activemq</groupId> <version>2.5.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>artemis-hqclient-protocol</artifactId> <packaging>bundle</packaging> @@ -32,24 +33,19 @@ <dependencies> <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-processor</artifactId> - <scope>provided</scope> - <optional>true</optional> - </dependency> - - <!-- - JBoss Logging - --> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-core-client</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>artemis-core-client</artifactId> + <artifactId>artemis-commons</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.cmpn</artifactId> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-protocols/artemis-mqtt-protocol/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-protocols/artemis-mqtt-protocol/pom.xml b/artemis-protocols/artemis-mqtt-protocol/pom.xml index 0088971..64d55d3 100644 --- a/artemis-protocols/artemis-mqtt-protocol/pom.xml +++ b/artemis-protocols/artemis-mqtt-protocol/pom.xml @@ -15,12 +15,13 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <artifactId>artemis-protocols</artifactId> <groupId>org.apache.activemq</groupId> <version>2.5.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>artemis-mqtt-protocol</artifactId> <packaging>bundle</packaging> @@ -37,20 +38,62 @@ </dependency> <dependency> <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-annotations</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> </dependency> <dependency> <groupId>org.apache.activemq</groupId> <artifactId>artemis-server</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-core-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-commons</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-journal</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-buffer</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-common</artifactId> </dependency> <dependency> <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> + <artifactId>netty-codec-mqtt</artifactId> + <version>${netty.version}</version> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.osgi</groupId> + <artifactId>osgi.cmpn</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-protocols/artemis-openwire-protocol/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-protocols/artemis-openwire-protocol/pom.xml b/artemis-protocols/artemis-openwire-protocol/pom.xml index 61efdc3..8e0c1d5 100644 --- a/artemis-protocols/artemis-openwire-protocol/pom.xml +++ b/artemis-protocols/artemis-openwire-protocol/pom.xml @@ -15,14 +15,16 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <artifactId>artemis-protocols</artifactId> <groupId>org.apache.activemq</groupId> <version>2.5.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>artemis-openwire-protocol</artifactId> + <packaging>bundle</packaging> <name>ActiveMQ Artemis OpenWire Protocol</name> <properties> @@ -36,10 +38,6 @@ <scope>provided</scope> <optional>true</optional> </dependency> - - <!-- - JBoss Logging - --> <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> @@ -49,10 +47,6 @@ <artifactId>activemq-client</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> <groupId>org.apache.activemq</groupId> <artifactId>artemis-server</artifactId> <version>${project.version}</version> @@ -62,10 +56,48 @@ <artifactId>artemis-jms-client</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-core-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-commons</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-journal</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.fusesource.hawtbuf</groupId> + <artifactId>hawtbuf</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-buffer</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.cmpn</artifactId> + </dependency> </dependencies> - <packaging>bundle</packaging> - <build> <plugins> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-protocols/artemis-stomp-protocol/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-protocols/artemis-stomp-protocol/pom.xml b/artemis-protocols/artemis-stomp-protocol/pom.xml index de8e972..cea5fd6 100644 --- a/artemis-protocols/artemis-stomp-protocol/pom.xml +++ b/artemis-protocols/artemis-stomp-protocol/pom.xml @@ -23,6 +23,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>artemis-stomp-protocol</artifactId> + <packaging>bundle</packaging> <name>ActiveMQ Artemis STOMP Protocol</name> @@ -33,14 +34,16 @@ <dependencies> <dependency> <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-annotations</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-processor</artifactId> <scope>provided</scope> <optional>true</optional> </dependency> - - <!-- - JBoss Logging - --> <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> @@ -50,7 +53,32 @@ <artifactId>artemis-server</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-core-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-commons</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-journal</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-buffer</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport</artifactId> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.cmpn</artifactId> + </dependency> </dependencies> - - <packaging>bundle</packaging> </project> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-ra/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-ra/pom.xml b/artemis-ra/pom.xml index 993eeda..b7a2f01 100644 --- a/artemis-ra/pom.xml +++ b/artemis-ra/pom.xml @@ -38,10 +38,12 @@ <scope>provided</scope> <optional>true</optional> </dependency> - - <!-- - JBoss Logging - --> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-annotations</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> @@ -59,26 +61,18 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>artemis-jms-server</artifactId> - <version>${project.version}</version> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> <scope>provided</scope> - <exclusions> - <exclusion> - <!-- exclude JCA 1.5 spec here so geronimo dependency will be used --> - <groupId>org.jboss.spec.javax.resource</groupId> - <artifactId>jboss-connector-api_1.5_spec</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> + <artifactId>geronimo-jta_1.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-ejb_3.0_spec</artifactId> + <artifactId>geronimo-jms_2.0_spec</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -86,6 +80,15 @@ <artifactId>artemis-service-extensions</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-commons</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jgroups</groupId> + <artifactId>jgroups</artifactId> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-rest/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-rest/pom.xml b/artemis-rest/pom.xml index 91482de..f848c89 100644 --- a/artemis-rest/pom.xml +++ b/artemis-rest/pom.xml @@ -16,16 +16,17 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.activemq</groupId> <artifactId>artemis-pom</artifactId> <version>2.5.0-SNAPSHOT</version> </parent> - <name>ActiveMQ Artemis REST Interface Implementation</name> <groupId>org.apache.activemq.rest</groupId> <artifactId>artemis-rest</artifactId> <packaging>jar</packaging> + <name>ActiveMQ Artemis REST Interface Implementation</name> <properties> <activemq.basedir>${project.basedir}/..</activemq.basedir> @@ -40,7 +41,12 @@ <artifactId>jboss-logging-processor</artifactId> <scope>provided</scope> <optional>true</optional> - + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-annotations</artifactId> + <scope>provided</scope> + <optional>true</optional> </dependency> <dependency> <groupId>org.jboss.logging</groupId> @@ -53,6 +59,12 @@ <dependency> <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-jaxrs</artifactId> + <exclusions> + <exclusion> + <groupId>org.jboss.spec.javax.ws.rs</groupId> + <artifactId>jboss-jaxrs-api_2.0_spec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.resteasy</groupId> @@ -74,24 +86,32 @@ </dependency> <dependency> <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-atom-provider</artifactId> + <artifactId>tjws</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>org.jboss.resteasy</groupId> - <artifactId>tjws</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-server</artifactId> + <version>${project.version}</version> </dependency> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-jms-server</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>artemis-server</artifactId> + <artifactId>artemis-jms-client</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>artemis-jms-server</artifactId> + <artifactId>artemis-core-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-commons</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -100,7 +120,28 @@ </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.1_spec</artifactId> + <artifactId>geronimo-jaxrs_2.0_spec</artifactId> + <version>1.0-alpha-1</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.2.7</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>4.3.3</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.3.6</version> </dependency> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-selector/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-selector/pom.xml b/artemis-selector/pom.xml index 0eb32fa..f496b47 100644 --- a/artemis-selector/pom.xml +++ b/artemis-selector/pom.xml @@ -32,14 +32,18 @@ </properties> <dependencies> - + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>2.0.2</version> + <optional>true</optional> + </dependency> <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> <version>2.7.2</version> <optional>true</optional> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-server-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-server-osgi/pom.xml b/artemis-server-osgi/pom.xml index 2f73009..d3fbb11 100644 --- a/artemis-server-osgi/pom.xml +++ b/artemis-server-osgi/pom.xml @@ -76,7 +76,6 @@ <artifactId>artemis-service-extensions</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>org.jboss.modules</groupId> <artifactId>jboss-modules</artifactId> @@ -97,13 +96,22 @@ <optional>true</optional> </dependency> <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-annotations</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + </dependency> + <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> <version>2.7.2</version> <optional>true</optional> <scope>provided</scope> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -116,6 +124,16 @@ <version>3.2</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.cmpn</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-server/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-server/pom.xml b/artemis-server/pom.xml index 551dbd0..4331282 100644 --- a/artemis-server/pom.xml +++ b/artemis-server/pom.xml @@ -38,10 +38,12 @@ <scope>provided</scope> <optional>true</optional> </dependency> - - <!-- - JBoss Logging - --> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-annotations</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> @@ -78,6 +80,11 @@ </dependency> <dependency> <groupId>org.apache.activemq</groupId> + <artifactId>artemis-native</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> <artifactId>artemis-core-client</artifactId> <type>test-jar</type> <version>${project.version}</version> @@ -85,7 +92,55 @@ </dependency> <dependency> <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> + <artifactId>netty-buffer</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-common</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-epoll</artifactId> + <classifier>${netty-transport-native-epoll-classifier}</classifier> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-kqueue</artifactId> + <classifier>${netty-transport-native-kqueue-classifier}</classifier> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec</artifactId> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.6</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-json_1.0_spec</artifactId> + <version>1.0-alpha-1</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> <groupId>junit</groupId> @@ -105,6 +160,18 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.directory.server</groupId> + <artifactId>apacheds-server-annotations</artifactId> + <version>${directory-version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.directory.server</groupId> + <artifactId>apacheds-core-annotations</artifactId> + <version>${directory-version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.directory.jdbm</groupId> <artifactId>apacheds-jdbm2</artifactId> <version>${directory-jdbm2-version}</version> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-service-extensions/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-service-extensions/pom.xml b/artemis-service-extensions/pom.xml index 162dff7..84f2a67 100644 --- a/artemis-service-extensions/pom.xml +++ b/artemis-service-extensions/pom.xml @@ -27,6 +27,10 @@ <packaging>jar</packaging> <name>ActiveMQ Artemis Service Extensions</name> + <properties> + <activemq.basedir>${project.basedir}/..</activemq.basedir> + </properties> + <dependencies> <dependency> <groupId>org.apache.activemq</groupId> @@ -39,6 +43,11 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-commons</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> </dependency> @@ -49,6 +58,17 @@ <optional>true</optional> </dependency> <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-annotations</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.jboss.logmanager</groupId> + <artifactId>jboss-logmanager</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jta_1.1_spec</artifactId> </dependency> @@ -57,25 +77,9 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - - - <dependency> - <groupId>org.jboss.logmanager</groupId> - <artifactId>jboss-logmanager</artifactId> - <scope>test</scope> - </dependency> - - <!-- this is for the log assertion --> <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>artemis-commons</artifactId> - <version>${project.version}</version> + <groupId>org.jgroups</groupId> + <artifactId>jgroups</artifactId> </dependency> - - </dependencies> - - <properties> - <activemq.basedir>${project.basedir}/..</activemq.basedir> - </properties> </project> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-tools/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-tools/pom.xml b/artemis-tools/pom.xml index 399036f..49256ba 100644 --- a/artemis-tools/pom.xml +++ b/artemis-tools/pom.xml @@ -16,16 +16,16 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.activemq</groupId> <artifactId>artemis-pom</artifactId> <version>2.5.0-SNAPSHOT</version> </parent> - <name>ActiveMQ Artemis Tools</name> - <groupId>org.apache.activemq</groupId> <artifactId>artemis-tools</artifactId> <packaging>jar</packaging> + <name>ActiveMQ Artemis Tools</name> <properties> <activemq.basedir>${project.basedir}/..</activemq.basedir> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/artemis-web/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-web/pom.xml b/artemis-web/pom.xml index e8542a3..a9be5c0 100644 --- a/artemis-web/pom.xml +++ b/artemis-web/pom.xml @@ -39,6 +39,16 @@ <optional>true</optional> </dependency> <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-annotations</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + </dependency> + <dependency> <groupId>org.apache.activemq</groupId> <artifactId>artemis-dto</artifactId> <version>${project.version}</version> @@ -49,6 +59,36 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-core-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-commons</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-buffer</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-common</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + </dependency> + <dependency> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-all</artifactId> <type>jar</type> @@ -64,22 +104,5 @@ <artifactId>jboss-logmanager</artifactId> <scope>test</scope> </dependency> - - <!-- this is for the log assertion --> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>artemis-commons</artifactId> - <version>${project.version}</version> - </dependency> - - <!-- - JBoss Logging - --> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging</artifactId> - </dependency> </dependencies> - - </project> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/examples/features/standard/spring-integration/pom.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/spring-integration/pom.xml b/examples/features/standard/spring-integration/pom.xml index 0f65403..6373b2b 100644 --- a/examples/features/standard/spring-integration/pom.xml +++ b/examples/features/standard/spring-integration/pom.xml @@ -49,6 +49,10 @@ under the License. <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/integration/activemq-spring-integration/pom.xml ---------------------------------------------------------------------- diff --git a/integration/activemq-spring-integration/pom.xml b/integration/activemq-spring-integration/pom.xml index dfd68a1..d3db773 100644 --- a/integration/activemq-spring-integration/pom.xml +++ b/integration/activemq-spring-integration/pom.xml @@ -35,20 +35,6 @@ <dependencies> <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-processor</artifactId> - <scope>provided</scope> - <optional>true</optional> - </dependency> - - <!-- - JBoss Logging - --> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging</artifactId> - </dependency> - <dependency> <groupId>org.apache.activemq</groupId> <artifactId>artemis-server</artifactId> <version>${project.version}</version> @@ -60,20 +46,8 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jms</artifactId> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringBundle.java ---------------------------------------------------------------------- diff --git a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringBundle.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringBundle.java deleted file mode 100644 index c931b5a..0000000 --- a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringBundle.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.artemis.spring; - -import org.jboss.logging.annotations.MessageBundle; - -/** - * Logger Code 17 - * - * each message id must be 6 digits long starting with 17, the 3rd digit should be 9 - * - * so 179000 to 179999 - */ -@MessageBundle(projectCode = "AMQ") -public class ActiveMQSpringBundle { - -} http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringLogger.java ---------------------------------------------------------------------- diff --git a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringLogger.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringLogger.java deleted file mode 100644 index 57e9971..0000000 --- a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringLogger.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.artemis.spring; - -import org.jboss.logging.annotations.MessageLogger; - -/** - * Logger Code 17 - * - * each message id must be 6 digits long starting with 17, the 3rd digit donates the level so - * - * INF0 1 - * WARN 2 - * DEBUG 3 - * ERROR 4 - * TRACE 5 - * FATAL 6 - * - * so an INFO message would be 171000 to 171999 - */ -@MessageLogger(projectCode = "AMQ") -public class ActiveMQSpringLogger { - -} http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d8c6bd5..339fb8b 100644 --- a/pom.xml +++ b/pom.xml @@ -295,14 +295,14 @@ <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-processor</artifactId> - <version>2.0.0.Alpha2</version> + <version>2.1.0.Final</version> <optional>true</optional> <!-- License: LGPL--> </dependency> <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-annotations</artifactId> - <version>2.0.0.Alpha1</version> + <version>2.1.0.Final</version> <scope>provided</scope> <optional>true</optional> <!-- License: Apache 2.0--> @@ -498,6 +498,18 @@ </dependency> <dependency> <groupId>io.netty</groupId> + <artifactId>netty-codec</artifactId> + <version>${netty.version}</version> + <!-- License: Apache 2.0 --> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-common</artifactId> + <version>${netty.version}</version> + <!-- License: Apache 2.0 --> + </dependency> + <dependency> + <groupId>io.netty</groupId> <artifactId>netty-transport-native-epoll</artifactId> <version>${netty.version}</version> <classifier>${netty-transport-native-epoll-classifier}</classifier> @@ -718,6 +730,12 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.jboss.arquillian.junit</groupId> + <artifactId>arquillian-junit-core</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.jacoco</groupId> <artifactId>org.jacoco.ant</artifactId> <version>${version.org.jacoco}</version> @@ -735,27 +753,23 @@ <version>${cdi-api.version}</version> <scope>provided</scope> </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <!-- OSGi support --> - <dependency> + <!-- OSGi support --> + <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> <version>6.0.0</version> <scope>provided</scope> <!-- License: Apache 2.0 --> - </dependency> - <dependency> + </dependency> + <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.cmpn</artifactId> <version>6.0.0</version> <scope>provided</scope> <!-- License: Apache 2.0 --> - </dependency> - - </dependencies> + </dependency> + </dependencies> + </dependencyManagement> <profiles> <profile> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/tests/artemis-test-support/pom.xml ---------------------------------------------------------------------- diff --git a/tests/artemis-test-support/pom.xml b/tests/artemis-test-support/pom.xml index 9322fcb..fe923a3 100644 --- a/tests/artemis-test-support/pom.xml +++ b/tests/artemis-test-support/pom.xml @@ -45,12 +45,36 @@ </dependency> <dependency> <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> + <artifactId>netty-buffer</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-common</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> </dependency> <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-client</artifactId> </dependency> + <dependency> + <groupId>org.fusesource.hawtbuf</groupId> + <artifactId>hawtbuf</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_2.0_spec</artifactId> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/55d7260a/tests/extra-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/extra-tests/pom.xml b/tests/extra-tests/pom.xml index cb692ba..df4dce6 100644 --- a/tests/extra-tests/pom.xml +++ b/tests/extra-tests/pom.xml @@ -45,10 +45,6 @@ <dependencies> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </dependency> - <dependency> <groupId>org.jboss.byteman</groupId> <artifactId>byteman</artifactId> <version>${byteman.version}</version> @@ -99,12 +95,22 @@ </dependency> <dependency> <groupId>org.apache.activemq</groupId> + <artifactId>artemis-core-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> <artifactId>artemis-server</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> </dependency> <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.apache.activemq.tests</groupId> <artifactId>integration-tests</artifactId> <version>${project.version}</version> @@ -142,31 +148,23 @@ </dependency> <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>artemis-cli</artifactId> + <artifactId>artemis-hqclient-protocol</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-service-extensions</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-ejb_3.0_spec</artifactId> + <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> </dependency> - <!--this specifically for the JMS Bridge --> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jta_1.1_spec</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.components</groupId> - <artifactId>geronimo-jaspi</artifactId> - </dependency> - <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_2.0_spec</artifactId> </dependency> @@ -178,6 +176,12 @@ </dependency> <dependency> <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-annotations</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> </dependency> <dependency>
