From 55d7260a075975f9093cafad82bd6a4d56e16c15 Mon Sep 17 00:00:00 2001 From: Justin Bertram Date: Tue, 31 Oct 2017 08:19:00 -0500 Subject: [PATCH] ARTEMIS-1510 refactor Maven poms Clean up unused declared dependencies and undeclared dependencies which are pulled in transitively. --- 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 | 42 ++- artemis-jms-server/pom.xml | 29 +- artemis-journal/pom.xml | 14 + artemis-junit/pom.xml | 29 +- artemis-maven-plugin/pom.xml | 40 +-- artemis-native/pom.xml | 6 + .../artemis-amqp-protocol/pom.xml | 42 ++- .../artemis-hornetq-protocol/pom.xml | 49 ++- .../artemis-hqclient-protocol/pom.xml | 26 +- .../artemis-mqtt-protocol/pom.xml | 51 +++- .../artemis-openwire-protocol/pom.xml | 54 +++- .../artemis-stomp-protocol/pom.xml | 40 ++- artemis-ra/pom.xml | 39 +-- artemis-rest/pom.xml | 63 +++- 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 + .../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 | 40 +-- tests/integration-tests/pom.xml | 278 +++++++++++------- tests/jms-tests/pom.xml | 49 +-- tests/joram-tests/pom.xml | 57 ++-- tests/performance-tests/pom.xml | 81 ++--- tests/smoke-tests/pom.xml | 47 +-- tests/soak-tests/pom.xml | 64 ++-- tests/stress-tests/pom.xml | 60 ++-- tests/timing-tests/pom.xml | 51 ++-- tests/unit-tests/pom.xml | 49 ++- 42 files changed, 1217 insertions(+), 812 deletions(-) delete mode 100644 integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringBundle.java delete mode 100644 integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringLogger.java diff --git a/artemis-cdi-client/pom.xml b/artemis-cdi-client/pom.xml index 39f344f8e2..4c9783e88d 100644 --- a/artemis-cdi-client/pom.xml +++ b/artemis-cdi-client/pom.xml @@ -19,101 +19,133 @@ --> - - artemis-pom - org.apache.activemq - 2.5.0-SNAPSHOT - .. - - 4.0.0 + + artemis-pom + org.apache.activemq + 2.5.0-SNAPSHOT + .. + + 4.0.0 - - ${project.basedir}/.. - + + ${project.basedir}/.. + - artemis-cdi-client - ActiveMQ Artemis CDI Integration + artemis-cdi-client + ActiveMQ Artemis CDI Integration - - - org.jboss.logging - jboss-logging-processor - provided - true - - - org.jboss.logging - jboss-logging - - - org.apache.activemq - artemis-jms-client - ${project.version} - - - org.apache.activemq - artemis-jms-server - ${project.version} - - - javax.enterprise - cdi-api - - - org.jboss.logmanager - jboss-logmanager - test - - - org.jboss.arquillian.junit - arquillian-junit-container - - - junit - junit - - - - - Weld - - true - - - - org.jboss.weld.se - weld-se - - - org.jboss.arquillian.container - arquillian-weld-embedded - - - - - OWB - - - org.apache.openwebbeans - openwebbeans-impl - - - org.apache.openwebbeans - openwebbeans-spi - - - org.apache.openwebbeans - openwebbeans-resource - - - org.apache.openwebbeans.arquillian - owb-arquillian-standalone - - - org.apache.geronimo.specs - geronimo-annotation_1.2_spec - - - - + + + org.jboss.logging + jboss-logging-processor + provided + true + + + org.jboss.logging + jboss-logging-annotations + provided + true + + + org.jboss.logging + jboss-logging + + + org.jboss.logmanager + jboss-logmanager + + + org.apache.activemq + artemis-core-client + ${project.version} + + + org.apache.activemq + artemis-jms-client + ${project.version} + + + org.apache.activemq + artemis-server + ${project.version} + + + org.apache.activemq + artemis-jms-server + ${project.version} + + + javax.inject + javax.inject + + + javax.enterprise + cdi-api + + + org.jboss.arquillian.junit + arquillian-junit-core + + + junit + junit + + + org.apache.geronimo.specs + geronimo-jms_2.0_spec + + + org.jboss.shrinkwrap + shrinkwrap-api + 1.2.6 + + + org.jboss.arquillian.junit + arquillian-junit-container + + + + + Weld + + true + + + + org.jboss.weld.se + weld-se + + + org.jboss.arquillian.container + arquillian-weld-embedded + + + + + OWB + + + org.apache.openwebbeans + openwebbeans-impl + + + org.apache.openwebbeans + openwebbeans-spi + + + org.apache.openwebbeans + openwebbeans-resource + + + org.apache.openwebbeans.arquillian + owb-arquillian-standalone + + + org.apache.geronimo.specs + geronimo-annotation_1.2_spec + + + + diff --git a/artemis-cli/pom.xml b/artemis-cli/pom.xml index b707298f24..775fe2df7a 100644 --- a/artemis-cli/pom.xml +++ b/artemis-cli/pom.xml @@ -33,6 +33,31 @@ + + org.apache.activemq + artemis-jms-client + ${project.version} + + + org.apache.activemq + artemis-commons + ${project.version} + + + org.apache.activemq + artemis-core-client + ${project.version} + + + org.apache.activemq + artemis-journal + ${project.version} + + + org.apache.activemq + artemis-native + ${project.version} + org.apache.activemq artemis-server @@ -53,6 +78,28 @@ artemis-dto ${project.version} + + javax.inject + javax.inject + + + com.google.guava + guava + + + org.apache.geronimo.specs + geronimo-jms_2.0_spec + + + org.apache.geronimo.specs + geronimo-json_1.0_spec + + + org.jboss.logging + jboss-logging-annotations + provided + true + org.jboss.logging jboss-logging-processor @@ -63,11 +110,6 @@ org.jboss.logging jboss-logging - - org.jboss.logmanager - jboss-logmanager - test - io.airlift airline @@ -99,24 +141,6 @@ junit test - - org.apache.activemq - artemis-amqp-protocol - ${project.version} - test - - - org.apache.activemq - artemis-stomp-protocol - ${project.version} - test - - - org.apache.activemq - artemis-openwire-protocol - ${project.version} - test - org.apache.activemq artemis-commons @@ -124,8 +148,6 @@ test test-jar - - diff --git a/artemis-commons/pom.xml b/artemis-commons/pom.xml index c566fb8655..3449b48e88 100644 --- a/artemis-commons/pom.xml +++ b/artemis-commons/pom.xml @@ -38,6 +38,12 @@ provided true + + org.jboss.logging + jboss-logging-annotations + provided + true + org.jboss.logmanager jboss-logmanager diff --git a/artemis-core-client/pom.xml b/artemis-core-client/pom.xml index dc9fd1e0d1..6d3d39caa6 100644 --- a/artemis-core-client/pom.xml +++ b/artemis-core-client/pom.xml @@ -38,6 +38,12 @@ provided true + + org.jboss.logging + jboss-logging-annotations + provided + true + org.jboss.logging jboss-logging @@ -64,6 +70,12 @@ junit test + + org.hamcrest + hamcrest-core + 1.3 + test + org.apache.geronimo.specs geronimo-json_1.0_spec @@ -86,6 +98,26 @@ io.netty netty-codec-http + + io.netty + netty-buffer + + + io.netty + netty-transport + + + io.netty + netty-handler + + + io.netty + netty-codec + + + io.netty + netty-common + diff --git a/artemis-dto/pom.xml b/artemis-dto/pom.xml index f875957d9a..05de601472 100644 --- a/artemis-dto/pom.xml +++ b/artemis-dto/pom.xml @@ -31,14 +31,6 @@ ${project.basedir}/.. - - - org.apache.activemq - artemis-commons - ${project.version} - - - diff --git a/artemis-features/pom.xml b/artemis-features/pom.xml index 9d14abc904..e57e00d39f 100644 --- a/artemis-features/pom.xml +++ b/artemis-features/pom.xml @@ -29,15 +29,15 @@ 4.1.1 - - - org.apache.karaf.features - framework - ${karaf.version} - kar - provided - - + + + org.apache.karaf.features + framework + ${karaf.version} + kar + provided + + diff --git a/artemis-jdbc-store/pom.xml b/artemis-jdbc-store/pom.xml index 738f2d0b2c..a820a15b04 100644 --- a/artemis-jdbc-store/pom.xml +++ b/artemis-jdbc-store/pom.xml @@ -40,6 +40,20 @@ provided true + + org.jboss.logging + jboss-logging + + + org.jboss.logmanager + jboss-logmanager + test + + + org.apache.activemq + artemis-commons + ${project.version} + org.apache.activemq artemis-commons @@ -47,16 +61,15 @@ test test-jar - - org.jboss.logging - jboss-logging + org.apache.activemq + artemis-journal + ${project.version} - - org.jboss.logmanager - jboss-logmanager - test + org.apache.activemq + artemis-core-client + ${project.version} @@ -65,30 +78,15 @@ derby test - org.postgresql postgresql provided - - - org.apache.activemq - artemis-journal - ${project.version} - - - - org.apache.activemq - artemis-core-client - ${project.version} - - junit junit test - diff --git a/artemis-jms-server/pom.xml b/artemis-jms-server/pom.xml index a44fd6ecce..489ac4fbb1 100644 --- a/artemis-jms-server/pom.xml +++ b/artemis-jms-server/pom.xml @@ -38,6 +38,16 @@ provided true + + org.jboss.logging + jboss-logging-annotations + provided + true + + + org.jboss.logging + jboss-logging + org.apache.activemq artemis-core-client @@ -53,6 +63,16 @@ artemis-server ${project.version} + + org.apache.activemq + artemis-journal + ${project.version} + + + org.apache.activemq + artemis-commons + ${project.version} + org.apache.activemq artemis-service-extensions @@ -62,23 +82,14 @@ org.apache.geronimo.specs geronimo-jms_2.0_spec - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - org.apache.geronimo.specs geronimo-jta_1.1_spec - 1.1.1 org.apache.geronimo.specs geronimo-json_1.0_spec - - org.apache.johnzon - johnzon-core - diff --git a/artemis-journal/pom.xml b/artemis-journal/pom.xml index f7e1ee69d5..5b493efdd7 100644 --- a/artemis-journal/pom.xml +++ b/artemis-journal/pom.xml @@ -38,6 +38,12 @@ provided true + + org.jboss.logging + jboss-logging-annotations + provided + true + junit diff --git a/artemis-junit/pom.xml b/artemis-junit/pom.xml index b3254dd1cf..edc2d0a273 100644 --- a/artemis-junit/pom.xml +++ b/artemis-junit/pom.xml @@ -41,8 +41,8 @@ - org.jboss.logmanager - jboss-logmanager + org.jboss.logging + jboss-logging org.apache.activemq @@ -54,16 +54,31 @@ artemis-jms-client ${project.version} + + org.apache.activemq + artemis-server + ${project.version} + + + org.apache.activemq + artemis-core-client + ${project.version} + + + org.apache.activemq + artemis-commons + ${project.version} + + + + org.apache.geronimo.specs + geronimo-jms_2.0_spec + org.slf4j slf4j-api - - - org.slf4j - slf4j-simple - diff --git a/artemis-maven-plugin/pom.xml b/artemis-maven-plugin/pom.xml index 01f85ea4bb..d1a330db57 100644 --- a/artemis-maven-plugin/pom.xml +++ b/artemis-maven-plugin/pom.xml @@ -38,43 +38,43 @@ 3.3.3 - org.apache.maven.plugins - maven-dependency-plugin - 2.0 + org.apache.maven + maven-artifact + 3.3.3 + + + org.apache.maven + maven-project + 2.0.8 org.eclipse.aether aether-api 1.0.2.v20150114 - - org.eclipse.aether - aether-util - 1.0.2.v20150114 - - - org.apache.activemq - artemis-server - ${project.version} - - - org.apache.activemq - artemis-jms-server - ${project.version} - org.apache.activemq artemis-boot ${project.version} + + org.apache.activemq + artemis-commons + ${project.version} + + + org.apache.activemq + artemis-jms-client + ${project.version} + org.apache.activemq artemis-cli ${project.version} - io.netty - netty-all + org.apache.geronimo.specs + geronimo-jms_2.0_spec org.apache.maven.plugin-tools diff --git a/artemis-native/pom.xml b/artemis-native/pom.xml index 9834f90c4b..5d59498179 100644 --- a/artemis-native/pom.xml +++ b/artemis-native/pom.xml @@ -33,6 +33,12 @@ provided true + + org.jboss.logging + jboss-logging-annotations + provided + true + org.jboss.logging diff --git a/artemis-protocols/artemis-amqp-protocol/pom.xml b/artemis-protocols/artemis-amqp-protocol/pom.xml index 2a956d1ed1..30200a1c54 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. --> + 4.0.0 + artemis-protocols org.apache.activemq 2.5.0-SNAPSHOT - 4.0.0 artemis-amqp-protocol + bundle ActiveMQ Artemis AMQP Protocol @@ -36,6 +38,11 @@ artemis-jms-client ${project.version} + + org.apache.activemq + artemis-selector + ${project.version} + org.apache.activemq artemis-core-client @@ -47,6 +54,12 @@ provided true + + org.jboss.logging + jboss-logging-annotations + provided + true + + 4.0.0 + artemis-protocols org.apache.activemq 2.5.0-SNAPSHOT - 4.0.0 artemis-hornetq-protocol bundle @@ -31,29 +32,47 @@ - - org.jboss.logging - jboss-logging-processor - provided - true - - - - - org.jboss.logging - jboss-logging - org.apache.activemq artemis-server ${project.version} + + + org.apache.activemq + artemis-commons + + org.apache.activemq artemis-hqclient-protocol ${project.version} + + + org.apache.activemq + artemis-commons + + + + + org.apache.activemq + artemis-core-client + ${project.version} + + + org.apache.activemq + artemis-commons + + + + + org.apache.activemq + artemis-commons + ${project.version} + + + org.osgi + osgi.cmpn diff --git a/artemis-protocols/artemis-hqclient-protocol/pom.xml b/artemis-protocols/artemis-hqclient-protocol/pom.xml index 75eec2f119..438e0a3285 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. --> + 4.0.0 + artemis-protocols org.apache.activemq 2.5.0-SNAPSHOT - 4.0.0 artemis-hqclient-protocol bundle @@ -31,25 +32,20 @@ - - org.jboss.logging - jboss-logging-processor - provided - true - - - - - org.jboss.logging - jboss-logging - org.apache.activemq artemis-core-client ${project.version} + + org.apache.activemq + artemis-commons + ${project.version} + + + org.osgi + osgi.cmpn + diff --git a/artemis-protocols/artemis-mqtt-protocol/pom.xml b/artemis-protocols/artemis-mqtt-protocol/pom.xml index 00889710ba..64d55d397d 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. --> + 4.0.0 + artemis-protocols org.apache.activemq 2.5.0-SNAPSHOT - 4.0.0 artemis-mqtt-protocol bundle @@ -35,6 +36,10 @@ org.jboss.logging jboss-logging-processor + + org.jboss.logging + jboss-logging-annotations + org.jboss.logging jboss-logging @@ -43,14 +48,52 @@ org.apache.activemq artemis-server ${project.version} + + + io.netty + netty-all + + + + + org.apache.activemq + artemis-core-client + ${project.version} + + + org.apache.activemq + artemis-commons + ${project.version} + + + org.apache.activemq + artemis-journal + ${project.version} io.netty - netty-all + netty-buffer - junit - junit + io.netty + netty-transport + + + io.netty + netty-codec + + + io.netty + netty-common + + + io.netty + netty-codec-mqtt + ${netty.version} + + + org.osgi + osgi.cmpn diff --git a/artemis-protocols/artemis-openwire-protocol/pom.xml b/artemis-protocols/artemis-openwire-protocol/pom.xml index 61efdc3f86..8e0c1d515b 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. --> + 4.0.0 + artemis-protocols org.apache.activemq 2.5.0-SNAPSHOT - 4.0.0 artemis-openwire-protocol + bundle ActiveMQ Artemis OpenWire Protocol @@ -36,10 +38,6 @@ provided true - - org.jboss.logging jboss-logging @@ -48,10 +46,6 @@ org.apache.activemq activemq-client - - org.slf4j - slf4j-api - org.apache.activemq artemis-server @@ -62,10 +56,48 @@ artemis-jms-client ${project.version} + + org.apache.activemq + artemis-core-client + ${project.version} + + + org.apache.activemq + artemis-commons + ${project.version} + + + org.apache.activemq + artemis-journal + ${project.version} + + + org.fusesource.hawtbuf + hawtbuf + + + io.netty + netty-buffer + + + io.netty + netty-transport + + + io.netty + netty-codec + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + 1.1.1 + + + org.osgi + osgi.cmpn + - bundle - diff --git a/artemis-protocols/artemis-stomp-protocol/pom.xml b/artemis-protocols/artemis-stomp-protocol/pom.xml index de8e972749..cea5fd60fb 100644 --- a/artemis-protocols/artemis-stomp-protocol/pom.xml +++ b/artemis-protocols/artemis-stomp-protocol/pom.xml @@ -23,6 +23,7 @@ 4.0.0 artemis-stomp-protocol + bundle ActiveMQ Artemis STOMP Protocol @@ -31,16 +32,18 @@ + + org.jboss.logging + jboss-logging-annotations + provided + true + org.jboss.logging jboss-logging-processor provided true - - org.jboss.logging jboss-logging @@ -50,7 +53,32 @@ artemis-server ${project.version} + + org.apache.activemq + artemis-core-client + ${project.version} + + + org.apache.activemq + artemis-commons + ${project.version} + + + org.apache.activemq + artemis-journal + ${project.version} + + + io.netty + netty-buffer + + + io.netty + netty-transport + + + org.osgi + osgi.cmpn + - - bundle diff --git a/artemis-ra/pom.xml b/artemis-ra/pom.xml index 993eedaf30..b7a2f01ab1 100644 --- a/artemis-ra/pom.xml +++ b/artemis-ra/pom.xml @@ -38,10 +38,12 @@ provided true - - + + org.jboss.logging + jboss-logging-annotations + provided + true + org.jboss.logging jboss-logging @@ -58,19 +60,6 @@ ${project.version} provided - - org.apache.activemq - artemis-jms-server - ${project.version} - provided - - - - org.jboss.spec.javax.resource - jboss-connector-api_1.5_spec - - - org.apache.geronimo.specs geronimo-j2ee-connector_1.5_spec @@ -78,7 +67,12 @@ org.apache.geronimo.specs - geronimo-ejb_3.0_spec + geronimo-jta_1.1_spec + provided + + + org.apache.geronimo.specs + geronimo-jms_2.0_spec provided @@ -86,6 +80,15 @@ artemis-service-extensions ${project.version} + + org.apache.activemq + artemis-commons + ${project.version} + + + org.jgroups + jgroups + diff --git a/artemis-rest/pom.xml b/artemis-rest/pom.xml index 91482dea7e..f848c89323 100644 --- a/artemis-rest/pom.xml +++ b/artemis-rest/pom.xml @@ -16,16 +16,17 @@ --> 4.0.0 + org.apache.activemq artemis-pom 2.5.0-SNAPSHOT - ActiveMQ Artemis REST Interface Implementation org.apache.activemq.rest artemis-rest jar + ActiveMQ Artemis REST Interface Implementation ${project.basedir}/.. @@ -40,7 +41,12 @@ jboss-logging-processor provided true - + + + org.jboss.logging + jboss-logging-annotations + provided + true org.jboss.logging @@ -53,6 +59,12 @@ org.jboss.resteasy resteasy-jaxrs + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.0_spec + + org.jboss.resteasy @@ -72,17 +84,10 @@ org.jboss.resteasy resteasy-jackson-provider - - org.jboss.resteasy - resteasy-atom-provider - org.jboss.resteasy tjws - - - io.netty - netty-all + test org.apache.activemq @@ -94,13 +99,49 @@ artemis-jms-server ${project.version} + + org.apache.activemq + artemis-jms-client + ${project.version} + + + org.apache.activemq + artemis-core-client + ${project.version} + + + org.apache.activemq + artemis-commons + ${project.version} + org.apache.geronimo.specs geronimo-jms_2.0_spec org.apache.geronimo.specs - geronimo-annotation_1.1_spec + geronimo-jaxrs_2.0_spec + 1.0-alpha-1 + + + javax.xml.bind + jaxb-api + 2.2.7 + + + javax.servlet + servlet-api + 2.5 + + + org.apache.httpcomponents + httpcore + 4.3.3 + + + org.apache.httpcomponents + httpclient + 4.3.6 junit diff --git a/artemis-selector/pom.xml b/artemis-selector/pom.xml index 0eb32fa7fb..f496b4751b 100644 --- a/artemis-selector/pom.xml +++ b/artemis-selector/pom.xml @@ -32,14 +32,18 @@ - + + xml-apis + xml-apis + 2.0.2 + true + xalan xalan 2.7.2 true - junit junit diff --git a/artemis-server-osgi/pom.xml b/artemis-server-osgi/pom.xml index 2f73009a0f..d3fbb115c7 100644 --- a/artemis-server-osgi/pom.xml +++ b/artemis-server-osgi/pom.xml @@ -76,7 +76,6 @@ artemis-service-extensions ${project.version} - org.jboss.modules jboss-modules @@ -96,6 +95,16 @@ provided true + + org.jboss.logging + jboss-logging-annotations + provided + true + + + org.jboss.logging + jboss-logging + xalan xalan @@ -103,7 +112,6 @@ true provided - junit junit @@ -116,6 +124,16 @@ 3.2 test + + org.osgi + org.osgi.core + provided + + + org.osgi + osgi.cmpn + provided + diff --git a/artemis-server/pom.xml b/artemis-server/pom.xml index 551dbd02b3..43312820fd 100644 --- a/artemis-server/pom.xml +++ b/artemis-server/pom.xml @@ -38,10 +38,12 @@ provided true - - + + org.jboss.logging + jboss-logging-annotations + provided + true + org.jboss.logging jboss-logging @@ -76,6 +78,11 @@ artemis-core-client ${project.version} + + org.apache.activemq + artemis-native + ${project.version} + org.apache.activemq artemis-core-client @@ -85,7 +92,55 @@ io.netty - netty-all + netty-buffer + + + io.netty + netty-transport + + + io.netty + netty-codec-http + + + io.netty + netty-common + + + io.netty + netty-handler + + + io.netty + netty-transport-native-epoll + ${netty-transport-native-epoll-classifier} + + + io.netty + netty-transport-native-kqueue + ${netty-transport-native-kqueue-classifier} + + + io.netty + netty-codec + + + commons-beanutils + commons-beanutils + + + commons-io + commons-io + 2.6 + + + org.apache.geronimo.specs + geronimo-json_1.0_spec + 1.0-alpha-1 + + + com.google.guava + guava junit @@ -104,6 +159,18 @@ + + org.apache.directory.server + apacheds-server-annotations + ${directory-version} + test + + + org.apache.directory.server + apacheds-core-annotations + ${directory-version} + test + org.apache.directory.jdbm apacheds-jdbm2 diff --git a/artemis-service-extensions/pom.xml b/artemis-service-extensions/pom.xml index 162dff7b32..84f2a67404 100644 --- a/artemis-service-extensions/pom.xml +++ b/artemis-service-extensions/pom.xml @@ -27,6 +27,10 @@ jar ActiveMQ Artemis Service Extensions + + ${project.basedir}/.. + + org.apache.activemq @@ -38,6 +42,11 @@ artemis-jms-client ${project.version} + + org.apache.activemq + artemis-commons + ${project.version} + org.jboss.logging jboss-logging @@ -48,6 +57,17 @@ provided true + + org.jboss.logging + jboss-logging-annotations + provided + true + + + org.jboss.logmanager + jboss-logmanager + test + org.apache.geronimo.specs geronimo-jta_1.1_spec @@ -57,25 +77,9 @@ junit test - - - org.jboss.logmanager - jboss-logmanager - test + org.jgroups + jgroups - - - - org.apache.activemq - artemis-commons - ${project.version} - - - - - - ${project.basedir}/.. - diff --git a/artemis-tools/pom.xml b/artemis-tools/pom.xml index 399036fb39..49256ba5c7 100644 --- a/artemis-tools/pom.xml +++ b/artemis-tools/pom.xml @@ -16,16 +16,16 @@ --> 4.0.0 + org.apache.activemq artemis-pom 2.5.0-SNAPSHOT - ActiveMQ Artemis Tools - org.apache.activemq artemis-tools jar + ActiveMQ Artemis Tools ${project.basedir}/.. diff --git a/artemis-web/pom.xml b/artemis-web/pom.xml index e8542a349b..a9be5c0351 100644 --- a/artemis-web/pom.xml +++ b/artemis-web/pom.xml @@ -38,6 +38,16 @@ provided true + + org.jboss.logging + jboss-logging-annotations + provided + true + + + org.jboss.logging + jboss-logging + org.apache.activemq artemis-dto @@ -48,6 +58,36 @@ artemis-cli ${project.version} + + org.apache.activemq + artemis-core-client + ${project.version} + + + org.apache.activemq + artemis-commons + ${project.version} + + + io.netty + netty-buffer + + + io.netty + netty-codec-http + + + io.netty + netty-transport + + + io.netty + netty-common + + + io.netty + netty-handler + org.eclipse.jetty.aggregate jetty-all @@ -64,22 +104,5 @@ jboss-logmanager test - - - - org.apache.activemq - artemis-commons - ${project.version} - - - - - org.jboss.logging - jboss-logging - - - diff --git a/examples/features/standard/spring-integration/pom.xml b/examples/features/standard/spring-integration/pom.xml index 0f6540396b..6373b2b39e 100644 --- a/examples/features/standard/spring-integration/pom.xml +++ b/examples/features/standard/spring-integration/pom.xml @@ -49,6 +49,10 @@ under the License. org.springframework spring-context + + org.springframework + spring-jms + diff --git a/integration/activemq-spring-integration/pom.xml b/integration/activemq-spring-integration/pom.xml index dfd68a19b7..d3db773b48 100644 --- a/integration/activemq-spring-integration/pom.xml +++ b/integration/activemq-spring-integration/pom.xml @@ -34,20 +34,6 @@ - - org.jboss.logging - jboss-logging-processor - provided - true - - - - - org.jboss.logging - jboss-logging - org.apache.activemq artemis-server @@ -58,22 +44,10 @@ artemis-jms-server ${project.version} - - org.springframework - spring-core - org.springframework spring-beans - - org.springframework - spring-context - - - org.springframework - spring-jms - 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 c931b5ac86..0000000000 --- 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 { - -} 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 57e997105f..0000000000 --- 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 { - -} diff --git a/pom.xml b/pom.xml index d8c6bd5066..339fb8bbb1 100644 --- a/pom.xml +++ b/pom.xml @@ -295,14 +295,14 @@ org.jboss.logging jboss-logging-processor - 2.0.0.Alpha2 + 2.1.0.Final true org.jboss.logging jboss-logging-annotations - 2.0.0.Alpha1 + 2.1.0.Final provided true @@ -496,6 +496,18 @@ ${netty.version} + + io.netty + netty-codec + ${netty.version} + + + + io.netty + netty-common + ${netty.version} + + io.netty netty-transport-native-epoll @@ -717,6 +729,12 @@ ${arquillian.version} test + + org.jboss.arquillian.junit + arquillian-junit-core + ${arquillian.version} + test + org.jacoco org.jacoco.ant @@ -735,27 +753,23 @@ ${cdi-api.version} provided - - - - - - + + org.osgi org.osgi.core 6.0.0 provided - - + + org.osgi osgi.cmpn 6.0.0 provided - - - + + + diff --git a/tests/artemis-test-support/pom.xml b/tests/artemis-test-support/pom.xml index 9322fcbfbf..fe923a3d5e 100644 --- a/tests/artemis-test-support/pom.xml +++ b/tests/artemis-test-support/pom.xml @@ -45,12 +45,36 @@ io.netty - netty-all + netty-buffer + + + io.netty + netty-codec-http + + + io.netty + netty-transport + + + io.netty + netty-common + + + io.netty + netty-handler org.apache.activemq activemq-client + + org.fusesource.hawtbuf + hawtbuf + + + org.apache.geronimo.specs + geronimo-jms_2.0_spec + diff --git a/tests/extra-tests/pom.xml b/tests/extra-tests/pom.xml index cb692bacfa..df4dce6ebf 100644 --- a/tests/extra-tests/pom.xml +++ b/tests/extra-tests/pom.xml @@ -44,10 +44,6 @@ - - io.netty - netty-all - org.jboss.byteman byteman @@ -97,6 +93,11 @@ test test-jar + + org.apache.activemq + artemis-core-client + ${project.version} + org.apache.activemq artemis-server @@ -104,6 +105,11 @@ test test-jar + + org.apache.activemq + artemis-server + ${project.version} + org.apache.activemq.tests integration-tests @@ -142,30 +148,22 @@ org.apache.activemq - artemis-cli + artemis-hqclient-protocol + ${project.version} + + + org.apache.activemq + artemis-service-extensions ${project.version} org.apache.geronimo.specs geronimo-j2ee-connector_1.5_spec - - commons-logging - commons-logging - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - - org.apache.geronimo.specs geronimo-jta_1.1_spec - - org.apache.geronimo.components - geronimo-jaspi - org.apache.geronimo.specs geronimo-jms_2.0_spec @@ -176,6 +174,12 @@ provided true + + org.jboss.logging + jboss-logging-annotations + provided + true + org.jboss.logging jboss-logging diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml index befc8fabfe..1394baee84 100644 --- a/tests/integration-tests/pom.xml +++ b/tests/integration-tests/pom.xml @@ -16,6 +16,7 @@ --> 4.0.0 + org.apache.activemq.tests artemis-tests-pom @@ -29,8 +30,8 @@ ${project.basedir}/../.. 4.0.6 - 4.9.1 - 1.1.0 + 4.9.1 + 1.1.0 @@ -67,27 +68,10 @@ artemis-jms-client ${project.version} - - org.apache.geronimo.specs - geronimo-json_1.0_spec - test - - - org.apache.johnzon - johnzon-core - test - org.apache.activemq artemis-jms-server ${project.version} - - - - org.jboss.spec.javax.resource - jboss-connector-api_1.5_spec - - org.apache.activemq @@ -133,20 +117,71 @@ org.apache.activemq artemis-openwire-protocol ${project.version} + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + + org.apache.activemq artemis-hornetq-protocol ${project.version} + + org.apache.activemq + artemis-core-client + ${project.version} + + + org.apache.activemq + artemis-server + ${project.version} + + + org.apache.activemq + artemis-native + ${project.version} + + + org.apache.activemq + artemis-service-extensions + ${project.version} + + + org.apache.activemq.tests + artemis-test-support + ${project.version} + org.apache.activemq artemis-features ${project.version} pom - - + + org.apache.activemq.rest + artemis-rest + 2.5.0-SNAPSHOT + + + org.apache.activemq + artemis-junit + ${project.version} + test + + + org.apache.activemq + activemq-client + test + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + + + org.apache.activemq artemis-mqtt-protocol @@ -162,15 +197,48 @@ ${paho.client.mqttv3.version} - io.netty - netty-all + org.apache.geronimo.specs + geronimo-json_1.0_spec + test - - org.apache.geronimo.specs geronimo-j2ee-connector_1.5_spec + + org.apache.geronimo.specs + geronimo-jta_1.1_spec + + + org.apache.geronimo.specs + geronimo-jms_2.0_spec + + + org.apache.johnzon + johnzon-core + test + + + io.netty + netty-buffer + + + io.netty + netty-codec-http + + + io.netty + netty-codec-mqtt + ${netty.version} + + + io.netty + netty-handler + + + io.netty + netty-transport + junit junit @@ -182,10 +250,10 @@ true - org.apache.activemq - artemis-junit - ${project.version} - test + org.jboss.logging + jboss-logging-annotations + provided + true org.jboss.logging @@ -201,24 +269,14 @@ ${qpid.jms.version} - org.apache.qpid - proton-j - + org.apache.qpid + proton-j + org.slf4j slf4j-api 1.7.5 - - org.mortbay.jetty - jetty - 7.0.0.pre5 - - - org.jboss.javaee - jboss-javaee - 5.0.0.GA - @@ -226,24 +284,11 @@ derby test - org.postgresql postgresql test - - - org.apache.activemq - activemq-client - test - - - org.apache.geronimo.specs - geronimo-j2ee-management_1.1_spec - 1.0.1 - test - org.apache.directory.server apacheds-test-framework @@ -269,7 +314,7 @@ - + org.ops4j.pax.exam @@ -294,11 +339,6 @@ org.apache.karaf.shell.console ${karaf.version} - - org.apache.activemq.tests - artemis-test-support - ${project.version} - @@ -312,13 +352,6 @@ org.jboss.resteasy resteasy-jaxrs - - org.apache.activemq.rest - artemis-rest - 2.5.0-SNAPSHOT - compile - - org.codehaus.woodstox woodstox-core-asl @@ -343,6 +376,29 @@ ${directory-jdbm2-version} test + + org.springframework + spring-context + test + + + org.springframework + spring-jms + test + + + com.google.guava + guava + + + commons-io + commons-io + 2.6 + + + org.jgroups + jgroups + @@ -358,36 +414,36 @@ org.apache.maven.plugins - maven-assembly-plugin - - - process-test-classes - bwlist-rest-test-war - - single - - - src/test/resources/rest/bwlist-rest-test-asm.xml - rest-test-bwlist - false - target/test-classes/rest/ - - - - process-test-classes - rest-test-war - - single - - - src/test/resources/rest/rest-test-asm.xml - rest-test - false - target/test-classes/rest/ - - - - + maven-assembly-plugin + + + process-test-classes + bwlist-rest-test-war + + single + + + src/test/resources/rest/bwlist-rest-test-asm.xml + rest-test-bwlist + false + target/test-classes/rest/ + + + + process-test-classes + rest-test-war + + single + + + src/test/resources/rest/rest-test-asm.xml + rest-test + false + target/test-classes/rest/ + + + + org.apache.maven.plugins maven-jar-plugin @@ -412,19 +468,19 @@ -Djgroups.bind_addr=::1 ${activemq-surefire-argline} - - org.apache.servicemix.tooling - depends-maven-plugin - 1.2 - - - generate-depends-file - - generate-depends-file - - - - + + org.apache.servicemix.tooling + depends-maven-plugin + 1.2 + + + generate-depends-file + + generate-depends-file + + + + diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml index 1c2ef5f79b..54563eca15 100644 --- a/tests/jms-tests/pom.xml +++ b/tests/jms-tests/pom.xml @@ -16,6 +16,7 @@ --> 4.0.0 + org.apache.activemq.tests artemis-tests-pom @@ -31,13 +32,6 @@ - - org.apache.activemq - artemis-core-client - ${project.version} - test - test-jar - org.apache.activemq artemis-server @@ -46,11 +40,9 @@ test-jar - org.apache.activemq.tests - unit-tests + org.apache.activemq + artemis-core-client ${project.version} - test - test-jar org.apache.activemq @@ -69,45 +61,32 @@ org.apache.activemq - artemis-ra + artemis-server ${project.version} - - org.apache.activemq - artemis-cli - ${project.version} - - - org.apache.geronimo.specs - geronimo-j2ee-connector_1.5_spec - junit junit - - commons-logging - commons-logging - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - - - - org.apache.geronimo.components - geronimo-jaspi - org.apache.geronimo.specs geronimo-jms_2.0_spec + + org.apache.geronimo.specs + geronimo-jta_1.1_spec + org.jboss.logging jboss-logging-processor provided true - + + + org.jboss.logging + jboss-logging-annotations + provided + true org.jboss.logging diff --git a/tests/joram-tests/pom.xml b/tests/joram-tests/pom.xml index ea3a28df85..c8cc99fc6d 100644 --- a/tests/joram-tests/pom.xml +++ b/tests/joram-tests/pom.xml @@ -39,53 +39,40 @@ test test-jar - - org.apache.activemq - artemis-ra - ${project.version} - + org.apache.activemq artemis-amqp-protocol ${project.version} - org.apache.activemq - artemis-cli + artemis-jms-server ${project.version} - org.apache.geronimo.specs - geronimo-j2ee-connector_1.5_spec + org.apache.activemq + artemis-server + ${project.version} + + + org.apache.activemq + artemis-jms-client + ${project.version} + + + org.apache.activemq + artemis-core-client + ${project.version} junit junit - - commons-logging - commons-logging - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - - - org.apache.geronimo.components - geronimo-jaspi - org.apache.geronimo.specs geronimo-jms_2.0_spec - - org.apache.activemq artemis-commons @@ -98,6 +85,20 @@ ${qpid.jms.version} test + + org.jboss.logging + jboss-logging-processor + provided + true + + + org.jboss.logging + jboss-logging + + + org.jboss.logmanager + jboss-logmanager + diff --git a/tests/performance-tests/pom.xml b/tests/performance-tests/pom.xml index 1fd21d6930..d3ca1e9c45 100644 --- a/tests/performance-tests/pom.xml +++ b/tests/performance-tests/pom.xml @@ -36,8 +36,31 @@ org.apache.activemq artemis-core-client ${project.version} - test - test-jar + + + org.apache.activemq + artemis-server + ${project.version} + + + org.apache.activemq + artemis-jms-server + ${project.version} + + + org.apache.activemq + artemis-journal + ${project.version} + + + org.apache.activemq + artemis-native + ${project.version} + + + org.apache.activemq + artemis-commons + ${project.version} org.apache.activemq @@ -53,6 +76,13 @@ test test-jar + + org.apache.activemq + artemis-commons + ${project.version} + test + test-jar + org.apache.activemq.tests integration-tests @@ -65,51 +95,24 @@ artemis-jms-client ${project.version} - - org.apache.activemq - artemis-ra - ${project.version} - - - org.apache.activemq - artemis-cli - ${project.version} - - - org.apache.geronimo.specs - geronimo-j2ee-connector_1.5_spec - junit junit org.apache.geronimo.specs - geronimo-ejb_3.0_spec - - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - - - org.apache.geronimo.components - geronimo-jaspi - - - org.apache.geronimo.specs - geronimo-jms_2.0_spec - - - - - org.apache.activemq - artemis-commons - ${project.version} + geronimo-jms_1.1_spec + 1.1.1 test - test-jar - + + org.jboss.logmanager + jboss-logmanager + + + org.jboss.logging + jboss-logging + diff --git a/tests/smoke-tests/pom.xml b/tests/smoke-tests/pom.xml index f485de701c..7b883faa2c 100644 --- a/tests/smoke-tests/pom.xml +++ b/tests/smoke-tests/pom.xml @@ -31,13 +31,6 @@ - - org.apache.activemq - artemis-core-client - ${project.version} - test - test-jar - org.apache.activemq artemis-server @@ -45,13 +38,6 @@ test test-jar - - org.apache.activemq.tests - unit-tests - ${project.version} - test - test-jar - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - - - org.apache.geronimo.components - geronimo-jaspi - - - org.apache.geronimo.specs - geronimo-jms_2.0_spec - - - org.apache.activemq artemis-commons ${project.version} test - + + org.apache.activemq + artemis-commons + ${project.version} + test + test-jar + + + org.apache.geronimo.specs + geronimo-jta_1.1_spec + test + @@ -130,5 +105,4 @@ - diff --git a/tests/stress-tests/pom.xml b/tests/stress-tests/pom.xml index bbea935a29..25fad6590d 100644 --- a/tests/stress-tests/pom.xml +++ b/tests/stress-tests/pom.xml @@ -17,6 +17,7 @@ 4.0.0 + org.apache.activemq.tests artemis-tests-pom @@ -32,6 +33,31 @@ + + org.apache.activemq + artemis-server + ${project.version} + + + org.apache.activemq + artemis-journal + ${project.version} + + + org.apache.activemq + artemis-native + ${project.version} + + + org.apache.activemq + artemis-core-client + ${project.version} + + + org.apache.activemq + artemis-commons + ${project.version} + org.apache.activemq artemis-core-client @@ -67,58 +93,25 @@ test test-jar - - org.apache.activemq - artemis-jms-client - ${project.version} - - - org.apache.activemq - artemis-ra - ${project.version} - org.apache.activemq artemis-cli ${project.version} - - org.apache.geronimo.specs - geronimo-j2ee-connector_1.5_spec - junit junit - - commons-logging - commons-logging - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - - org.apache.geronimo.specs geronimo-jta_1.1_spec - - org.apache.geronimo.components - geronimo-jaspi - - - org.apache.geronimo.specs - geronimo-jms_2.0_spec - org.apache.derby derby ${apache.derby.version} test - - org.apache.activemq artemis-commons @@ -126,7 +119,6 @@ test test-jar - diff --git a/tests/timing-tests/pom.xml b/tests/timing-tests/pom.xml index 39fdf286f5..912e37f1b2 100644 --- a/tests/timing-tests/pom.xml +++ b/tests/timing-tests/pom.xml @@ -17,6 +17,7 @@ 4.0.0 + org.apache.activemq.tests artemis-tests-pom @@ -36,8 +37,31 @@ org.apache.activemq artemis-core-client ${project.version} - test - test-jar + + + org.apache.activemq + artemis-server + ${project.version} + + + org.apache.activemq + artemis-jms-server + ${project.version} + + + org.apache.activemq + artemis-journal + ${project.version} + + + org.apache.activemq + artemis-native + ${project.version} + + + org.apache.activemq + artemis-commons + ${project.version} org.apache.activemq @@ -59,45 +83,25 @@ ${project.version} test - - org.apache.activemq - artemis-cli - ${project.version} - - - org.apache.geronimo.specs - geronimo-j2ee-connector_1.5_spec - junit junit - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - - org.apache.geronimo.specs geronimo-jta_1.1_spec - - org.apache.geronimo.components - geronimo-jaspi - org.apache.geronimo.specs geronimo-jms_2.0_spec - - org.apache.activemq artemis-commons ${project.version} test + test-jar - @@ -112,5 +116,4 @@ - diff --git a/tests/unit-tests/pom.xml b/tests/unit-tests/pom.xml index 8d84f6a967..954b36e8cd 100644 --- a/tests/unit-tests/pom.xml +++ b/tests/unit-tests/pom.xml @@ -31,6 +31,11 @@ + + org.apache.activemq + artemis-core-client + ${project.version} + org.apache.activemq artemis-core-client @@ -60,12 +65,12 @@ org.apache.activemq - artemis-jms-server + artemis-server ${project.version} org.apache.activemq - artemis-core-client + artemis-jms-client ${project.version} @@ -78,19 +83,51 @@ artemis-cli ${project.version} + + org.apache.activemq + artemis-journal + ${project.version} + + + org.apache.activemq + artemis-native + ${project.version} + + + org.apache.geronimo.specs + geronimo-jms_2.0_spec + org.apache.geronimo.specs geronimo-j2ee-connector_1.5_spec + + org.apache.geronimo.specs + geronimo-jta_1.1_spec + junit junit + + io.netty + netty-transport + + + io.netty + netty-buffer + org.jboss.logging jboss-logging-processor provided true + + + org.jboss.logging + jboss-logging-annotations + provided + true