From 2762f18d32aa2aadc66dfccf94bea823df75336e Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Thu, 6 Feb 2014 15:20:34 +0000 Subject: QPID-5048: Maven POM refactoring - names, descriptions, dependencies & versions Patch supplied by Andrew MacBean git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1565303 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/amqp-1-0-client-jms/pom.xml | 17 +- qpid/java/amqp-1-0-client-websocket/pom.xml | 138 +----- qpid/java/amqp-1-0-client/pom.xml | 13 +- qpid/java/amqp-1-0-common/pom.xml | 10 +- qpid/java/bdbstore/jmx/pom.xml | 25 +- qpid/java/bdbstore/pom.xml | 27 +- qpid/java/bdbstore/systests/pom.xml | 27 +- qpid/java/broker-core/pom.xml | 50 +-- qpid/java/broker-plugins/access-control/pom.xml | 18 +- .../java/broker-plugins/amqp-0-10-protocol/pom.xml | 20 +- qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml | 18 +- qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml | 17 +- .../amqp-msg-conv-0-10-to-1-0/pom.xml | 24 +- .../amqp-msg-conv-0-8-to-0-10/pom.xml | 21 +- .../amqp-msg-conv-0-8-to-1-0/pom.xml | 24 +- qpid/java/broker-plugins/derby-store/pom.xml | 21 +- .../java/broker-plugins/jdbc-provider-bone/pom.xml | 15 +- qpid/java/broker-plugins/jdbc-store/pom.xml | 19 +- qpid/java/broker-plugins/management-http/pom.xml | 118 +---- qpid/java/broker-plugins/management-jmx/pom.xml | 19 +- qpid/java/broker-plugins/memory-store/pom.xml | 12 +- qpid/java/broker-plugins/websocket/pom.xml | 119 +---- qpid/java/broker/pom.xml | 52 ++- qpid/java/client/pom.xml | 18 +- qpid/java/common/pom.xml | 20 +- qpid/java/jca/pom.xml | 22 +- qpid/java/jca/rar/pom.xml | 40 +- qpid/java/management/common/pom.xml | 10 +- qpid/java/management/example/pom.xml | 13 +- qpid/java/perftests/pom.xml | 31 +- qpid/java/perftests/visualisation-jfc/pom.xml | 35 +- qpid/java/pom.xml | 489 ++++++++++++++++----- qpid/java/qpid-test-utils/pom.xml | 18 +- qpid/java/systests/pom.xml | 91 ++-- qpid/java/tools/pom.xml | 19 +- 35 files changed, 767 insertions(+), 863 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/amqp-1-0-client-jms/pom.xml b/qpid/java/amqp-1-0-client-jms/pom.xml index ffcfd223ae..2b73700eed 100644 --- a/qpid/java/amqp-1-0-client-jms/pom.xml +++ b/qpid/java/amqp-1-0-client-jms/pom.xml @@ -16,34 +16,35 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT - 4.0.0 qpid-amqp-1-0-client-jms + 0.28-SNAPSHOT + Qpid AMQP 1.0 Client JMS + AMQP 1.0 compliant JMS module org.apache.qpid qpid-amqp-1-0-client - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-amqp-1-0-common - 0.26-SNAPSHOT - compile + ${project.version} org.apache.geronimo.specs geronimo-jms_1.1_spec - 1.0 provided diff --git a/qpid/java/amqp-1-0-client-websocket/pom.xml b/qpid/java/amqp-1-0-client-websocket/pom.xml index 3862fb0fc5..78da6d3b9e 100644 --- a/qpid/java/amqp-1-0-client-websocket/pom.xml +++ b/qpid/java/amqp-1-0-client-websocket/pom.xml @@ -16,145 +16,41 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT - 4.0.0 qpid-amqp-1-0-client-websocket + 0.28-SNAPSHOT + Qpid AMQP 1.0 Client WebSocket + AMQP 1.0 compliant WebSocket module - org.apache.qpid qpid-amqp-1-0-client - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-amqp-1-0-common - 0.26-SNAPSHOT - compile + ${project.version} + + org.apache.geronimo.specs + geronimo-servlet_3.0_spec + - - org.apache.geronimo.specs - geronimo-servlet_3.0_spec - 1.0 - compile - - - - org.eclipse.jetty - jetty-server - 8.1.14.v20131031 - compile - - - org.eclipse.jetty.orbit - javax.servlet - - - org.eclipse.jetty - jetty-continuation - - - org.eclipse.jetty - jetty-http - - - - - - org.eclipse.jetty - jetty-continuation - 8.1.14.v20131031 - compile - - - - org.eclipse.jetty - jetty-security - 8.1.14.v20131031 - compile - - - org.eclipse.jetty - jetty-server - - - - - - org.eclipse.jetty - jetty-http - 8.1.14.v20131031 - compile - - - org.eclipse.jetty - jetty-io - - - - - org.eclipse.jetty - jetty-io - 8.1.14.v20131031 - compile - - - org.eclipse.jetty - jetty-util - - - - - - org.eclipse.jetty - jetty-servlet - 8.1.14.v20131031 - compile - - - org.eclipse.jetty - jetty-security - - - - - - org.eclipse.jetty - jetty-util - 8.1.14.v20131031 - compile - - - - org.eclipse.jetty - jetty-websocket - 8.1.14.v20131031 - compile - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-io - - - org.eclipse.jetty - jetty-http - - - + + org.eclipse.jetty + jetty-websocket + diff --git a/qpid/java/amqp-1-0-client/pom.xml b/qpid/java/amqp-1-0-client/pom.xml index 1d6a444d6d..2bee6b43d1 100644 --- a/qpid/java/amqp-1-0-client/pom.xml +++ b/qpid/java/amqp-1-0-client/pom.xml @@ -16,21 +16,24 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT - 4.0.0 qpid-amqp-1-0-client + 0.28-SNAPSHOT + Qpid AMQP 1.0 Client + AMQP 1.0 compliant client module org.apache.qpid qpid-amqp-1-0-common - 0.26-SNAPSHOT - compile + ${project.version} diff --git a/qpid/java/amqp-1-0-common/pom.xml b/qpid/java/amqp-1-0-common/pom.xml index d771d58ab1..7b01caa5b0 100644 --- a/qpid/java/amqp-1-0-common/pom.xml +++ b/qpid/java/amqp-1-0-common/pom.xml @@ -16,14 +16,18 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT - 4.0.0 qpid-amqp-1-0-common + 0.28-SNAPSHOT + Qpid AMQP 1.0 Common + AMQP 1.0 compliant common module diff --git a/qpid/java/bdbstore/jmx/pom.xml b/qpid/java/bdbstore/jmx/pom.xml index 82ece2c66f..626f80b9ab 100644 --- a/qpid/java/bdbstore/jmx/pom.xml +++ b/qpid/java/bdbstore/jmx/pom.xml @@ -16,49 +16,48 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT ../../pom.xml - 4.0.0 qpid-bdbstore-jmx + 0.28-SNAPSHOT + Qpid BDB Message Store JMX + BDB message store JMX implementation org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} provided org.apache.qpid qpid-broker-plugins-management-jmx - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-bdbstore - 0.26-SNAPSHOT - compile + ${project.version} log4j log4j - ${log4j-version} - compile com.sleepycat je - 5.0.84 provided @@ -66,14 +65,14 @@ org.apache.qpid qpid-test-utils - 0.26-SNAPSHOT + ${project.version} test org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} test-jar test diff --git a/qpid/java/bdbstore/pom.xml b/qpid/java/bdbstore/pom.xml index ec71547038..60abfcb5cd 100644 --- a/qpid/java/bdbstore/pom.xml +++ b/qpid/java/bdbstore/pom.xml @@ -16,41 +16,41 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT - 4.0.0 qpid-bdbstore + 0.28-SNAPSHOT + Qpid BDB Message Store + BDB message store implementation using Oracle Berkeley DB Java Edition org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} provided org.apache.qpid qpid-broker-plugins-amqp-0-8-protocol - 0.26-SNAPSHOT - compile + ${project.version} log4j log4j - ${log4j-version} - compile com.sleepycat je - 5.0.97 provided @@ -58,14 +58,14 @@ org.apache.qpid qpid-test-utils - 0.26-SNAPSHOT + ${project.version} test org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} test-jar test @@ -73,21 +73,20 @@ org.apache.qpid qpid-broker-plugins-amqp-0-10-protocol - 0.26-SNAPSHOT + ${project.version} test org.apache.geronimo.specs geronimo-jms_1.1_spec - 1.0 test org.apache.qpid qpid-client - 0.26-SNAPSHOT + ${project.version} test diff --git a/qpid/java/bdbstore/systests/pom.xml b/qpid/java/bdbstore/systests/pom.xml index e095765ea1..01b87448e2 100644 --- a/qpid/java/bdbstore/systests/pom.xml +++ b/qpid/java/bdbstore/systests/pom.xml @@ -16,15 +16,19 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT ../../pom.xml - 4.0.0 qpid-bdbstore-systests + 0.28-SNAPSHOT + Qpid BDB Store System Tests + BDB message store system tests target${file.separator}qpid-broker${file.separator}${project.version} @@ -37,57 +41,46 @@ junit junit - ${junit-version} compile org.apache.qpid qpid-systests - 0.26-SNAPSHOT - compile + ${project.version} log4j log4j - ${log4j-version} - compile org.slf4j slf4j-api - ${slf4j-version} - compile org.apache.geronimo.specs geronimo-jms_1.1_spec - 1.0 provided org.apache.qpid qpid-bdbstore - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-bdbstore-jmx - 0.26-SNAPSHOT - compile + ${project.version} com.sleepycat je - 5.0.84 - compile diff --git a/qpid/java/broker-core/pom.xml b/qpid/java/broker-core/pom.xml index 7254de0251..4621a8df75 100644 --- a/qpid/java/broker-core/pom.xml +++ b/qpid/java/broker-core/pom.xml @@ -16,14 +16,18 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT - 4.0.0 qpid-broker-core + 0.28-SNAPSHOT + Qpid Java Broker Core + Broker core functionality and initial configuration ${basedir}/src/main/java @@ -33,50 +37,38 @@ org.apache.qpid qpid-common - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-management-common - 0.26-SNAPSHOT - compile + ${project.version} log4j log4j - ${log4j-version} - compile org.slf4j slf4j-api - ${slf4j-version} - compile org.slf4j slf4j-log4j12 - ${slf4j-version} - compile commons-logging commons-logging - 1.1.1 - compile xalan xalan - 2.7.0 - compile xml-apis @@ -88,15 +80,11 @@ commons-beanutils commons-beanutils-core - 1.8.3 - compile commons-digester commons-digester - 1.8.1 - compile commons-beanutils @@ -108,50 +96,36 @@ commons-codec commons-codec - 1.6 - compile commons-lang commons-lang - 2.6 - compile commons-collections commons-collections - 3.2.1 - compile commons-configuration commons-configuration - 1.8 - compile org.codehaus.jackson jackson-core-asl - 1.9.0 - compile org.codehaus.jackson jackson-mapper-asl - 1.9.0 - compile org.apache.bcel bcel - 5.2 - compile @@ -165,7 +139,7 @@ org.apache.qpid qpid-test-utils - 0.26-SNAPSHOT + ${project.version} test @@ -261,12 +235,12 @@ velocity velocity - 1.4 + ${velocity-version} velocity velocity-dep - 1.4 + ${velocity-version} diff --git a/qpid/java/broker-plugins/access-control/pom.xml b/qpid/java/broker-plugins/access-control/pom.xml index c63618380c..0c92129325 100644 --- a/qpid/java/broker-plugins/access-control/pom.xml +++ b/qpid/java/broker-plugins/access-control/pom.xml @@ -16,15 +16,19 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT ../../pom.xml - 4.0.0 qpid-broker-plugins-access-control + 0.28-SNAPSHOT + Qpid Access Control Broker Plug-in + Access Control broker plug-in ${project.build.directory}/generated-sources/generated-logmessages @@ -34,29 +38,27 @@ org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} provided log4j log4j - ${log4j-version} - compile org.apache.qpid qpid-test-utils - 0.26-SNAPSHOT + ${project.version} test org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} test-jar test diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml b/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml index 6bfce64240..c2ef3bff33 100644 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml @@ -16,50 +16,50 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT ../../pom.xml - 4.0.0 qpid-broker-plugins-amqp-0-10-protocol + 0.28-SNAPSHOT + Qpid AMQP 0-10 Protocol Plug-in + AMQP 0-10 protocol broker plug-in org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} provided log4j log4j - ${log4j-version} - compile org.slf4j slf4j-api - ${slf4j-version} - compile org.apache.qpid qpid-test-utils - 0.26-SNAPSHOT + ${project.version} test org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} test-jar test diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml b/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml index 0d8c8be3dd..3bbd624e65 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml @@ -16,43 +16,45 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT ../../pom.xml - 4.0.0 qpid-broker-plugins-amqp-0-8-protocol + 0.28-SNAPSHOT + Qpid AMQP 0-8 Protocol Broker Plug-in + AMQP 0-8, 0-9 and 0-9-1 protocol broker plug-in org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} provided log4j log4j - ${log4j-version} - compile org.apache.qpid qpid-test-utils - 0.26-SNAPSHOT + ${project.version} test org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} test-jar test diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml b/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml index 97db18011d..c3b28c5ee4 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml @@ -16,36 +16,37 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT ../../pom.xml - 4.0.0 qpid-broker-plugins-amqp-1-0-protocol + 0.28-SNAPSHOT + Qpid AMQP 1-0 Protocol Broker Plug-in + AMQP 1-0 protocol broker plug-in org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} provided org.apache.qpid qpid-amqp-1-0-common - 0.26-SNAPSHOT - compile + ${project.version} log4j log4j - ${log4j-version} - compile diff --git a/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml b/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml index 1403caee0a..38ff043377 100644 --- a/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml +++ b/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml @@ -16,50 +16,50 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT ../../pom.xml - 4.0.0 qpid-broker-plugins-amqp-msg-conv-0-10-to-1-0 + 0.28-SNAPSHOT + Qpid AMQP 0-10 to 1-0 Message Conversion Broker Plug-in + AMQP message conversion (0-10 to 1-0) broker plug-in org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} provided org.apache.qpid qpid-common - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-broker-plugins-amqp-0-10-protocol - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-amqp-1-0-common - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-broker-plugins-amqp-1-0-protocol - 0.26-SNAPSHOT - compile + ${project.version} diff --git a/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml index deccb6cf22..016f777212 100644 --- a/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml +++ b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml @@ -16,43 +16,44 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT ../../pom.xml - 4.0.0 qpid-broker-plugins-amqp-msg-conv-0-8-to-0-10 + 0.28-SNAPSHOT + Qpid AMQP 0-8 to 0-10 Message Conversion Broker Plug-in + AMQP message conversion (0-8, 0-9 and 0-9-1 to 0-10) broker plug-in org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} provided org.apache.qpid qpid-common - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-broker-plugins-amqp-0-8-protocol - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-broker-plugins-amqp-0-10-protocol - 0.26-SNAPSHOT - compile + ${project.version} diff --git a/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml index ec725e7e57..a01760f139 100644 --- a/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml +++ b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml @@ -16,50 +16,50 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT ../../pom.xml - 4.0.0 qpid-broker-plugins-amqp-msg-conv-0-8-to-1-0 + 0.28-SNAPSHOT + Qpid AMQP 0-8 to 1-0 Message Conversion Broker Plug-in + AMQP message conversion (0-8, 0-9 and 0-9-1 to 1-0) broker plug-in org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} provided org.apache.qpid qpid-common - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-broker-plugins-amqp-0-8-protocol - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-amqp-1-0-common - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-broker-plugins-amqp-1-0-protocol - 0.26-SNAPSHOT - compile + ${project.version} diff --git a/qpid/java/broker-plugins/derby-store/pom.xml b/qpid/java/broker-plugins/derby-store/pom.xml index 9b55875aa8..58088d7a75 100644 --- a/qpid/java/broker-plugins/derby-store/pom.xml +++ b/qpid/java/broker-plugins/derby-store/pom.xml @@ -16,50 +16,49 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT ../../pom.xml - 4.0.0 qpid-broker-plugins-derby-store + 0.28-SNAPSHOT + Qpid Derby Message Store + Apache Derby DB message store broker plug-in org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT - compile + ${project.version} org.apache.derby derby - 10.8.2.2 - compile log4j log4j - ${log4j-version} - compile org.apache.qpid qpid-test-utils - 0.26-SNAPSHOT + ${project.version} test org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} test-jar test diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml b/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml index 52631a44e3..af468af3af 100644 --- a/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml +++ b/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml @@ -16,29 +16,31 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT ../../pom.xml - 4.0.0 qpid-broker-plugins-jdbc-provider-bone + 0.28-SNAPSHOT + Qpid JDBC Message Store Connection Pooling Plug-in + JDBC Message Store Connection Pooling broker plug-in using BoneCP org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} provided com.jolbox bonecp - 0.7.1.RELEASE - compile @@ -51,7 +53,6 @@ com.google.guava guava - 14.0.1 runtime diff --git a/qpid/java/broker-plugins/jdbc-store/pom.xml b/qpid/java/broker-plugins/jdbc-store/pom.xml index ca861a42f3..a2541ec913 100644 --- a/qpid/java/broker-plugins/jdbc-store/pom.xml +++ b/qpid/java/broker-plugins/jdbc-store/pom.xml @@ -16,43 +16,45 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT ../../pom.xml - 4.0.0 qpid-broker-plugins-jdbc-store + 0.28-SNAPSHOT + Qpid JDBC Message Store Broker Plug-in + JDBC message store broker plug-in org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} provided log4j log4j - ${log4j-version} - compile org.apache.qpid qpid-test-utils - 0.26-SNAPSHOT + ${project.version} test org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} test-jar test @@ -60,7 +62,6 @@ org.apache.derby derby - 10.8.2.2 test diff --git a/qpid/java/broker-plugins/management-http/pom.xml b/qpid/java/broker-plugins/management-http/pom.xml index 57b2dd863b..d614bbf0b1 100644 --- a/qpid/java/broker-plugins/management-http/pom.xml +++ b/qpid/java/broker-plugins/management-http/pom.xml @@ -16,151 +16,51 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT ../../pom.xml - 4.0.0 qpid-broker-plugins-management-http + 0.28-SNAPSHOT + Qpid HTTP Management Broker Plug-in + HTTP Management broker plug-in org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} provided log4j log4j - ${log4j-version} - compile org.slf4j slf4j-api - ${slf4j-version} - compile org.apache.geronimo.specs geronimo-servlet_3.0_spec - 1.0 - compile org.eclipse.jetty jetty-server - 8.1.14.v20131031 - compile - - - org.eclipse.jetty.orbit - javax.servlet - - - org.eclipse.jetty - jetty-continuation - - - org.eclipse.jetty - jetty-http - - - - - - org.eclipse.jetty - jetty-continuation - 8.1.14.v20131031 - compile - - - - org.eclipse.jetty - jetty-security - 8.1.14.v20131031 - compile - - - org.eclipse.jetty - jetty-server - - - - - - org.eclipse.jetty - jetty-http - 8.1.14.v20131031 - compile - - - org.eclipse.jetty - jetty-io - - - - - - org.eclipse.jetty - jetty-io - 8.1.14.v20131031 - compile - - - org.eclipse.jetty - jetty-util - - org.eclipse.jetty jetty-servlet - 8.1.14.v20131031 - compile - - - org.eclipse.jetty - jetty-security - - - - - - org.eclipse.jetty - jetty-util - 8.1.14.v20131031 - compile - - - - org.eclipse.jetty - jetty-websocket - 8.1.14.v20131031 - compile - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-io - - - org.eclipse.jetty - jetty-http - - @@ -174,7 +74,7 @@ org.apache.qpid qpid-test-utils - 0.26-SNAPSHOT + ${project.version} test diff --git a/qpid/java/broker-plugins/management-jmx/pom.xml b/qpid/java/broker-plugins/management-jmx/pom.xml index 8a06fcf185..78b7f327ec 100644 --- a/qpid/java/broker-plugins/management-jmx/pom.xml +++ b/qpid/java/broker-plugins/management-jmx/pom.xml @@ -16,43 +16,44 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT ../../pom.xml - 4.0.0 qpid-broker-plugins-management-jmx + 0.28-SNAPSHOT + Qpid JMX Management Broker Plug-in + JMX management broker plug-in org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} provided org.apache.qpid qpid-management-common - 0.26-SNAPSHOT - compile + ${project.version} log4j log4j - ${log4j-version} - compile org.apache.qpid qpid-test-utils - 0.26-SNAPSHOT + ${project.version} test diff --git a/qpid/java/broker-plugins/memory-store/pom.xml b/qpid/java/broker-plugins/memory-store/pom.xml index 6bfd2a8d49..bdf503cd89 100644 --- a/qpid/java/broker-plugins/memory-store/pom.xml +++ b/qpid/java/broker-plugins/memory-store/pom.xml @@ -16,21 +16,25 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT ../../pom.xml - 4.0.0 qpid-broker-plugins-memory-store + 0.28-SNAPSHOT + Qpid Memory Message Store Broker Plug-in + Memory message store broker plug-in org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} provided diff --git a/qpid/java/broker-plugins/websocket/pom.xml b/qpid/java/broker-plugins/websocket/pom.xml index fb55be05c8..f7d9c45638 100644 --- a/qpid/java/broker-plugins/websocket/pom.xml +++ b/qpid/java/broker-plugins/websocket/pom.xml @@ -15,142 +15,45 @@ See the License for the specific language governing permissions and limitations under the License. --> - + + 4.0.0 + - qpid-project org.apache.qpid - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT ../../pom.xml - 4.0.0 qpid-broker-plugins-websocket + 0.28-SNAPSHOT + Qpid WebSocket Broker Plug-in + WebSocket broker plug-in org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} provided org.apache.geronimo.specs geronimo-servlet_3.0_spec - 1.0 - compile org.eclipse.jetty jetty-server - 8.1.14.v20131031 - compile - - - org.eclipse.jetty.orbit - javax.servlet - - - org.eclipse.jetty - jetty-continuation - - - org.eclipse.jetty - jetty-http - - - - - - org.eclipse.jetty - jetty-continuation - 8.1.14.v20131031 - compile - - - - org.eclipse.jetty - jetty-security - 8.1.14.v20131031 - compile - - - org.eclipse.jetty - jetty-server - - - - - - org.eclipse.jetty - jetty-http - 8.1.14.v20131031 - compile - - - org.eclipse.jetty - jetty-io - - - - - - org.eclipse.jetty - jetty-io - 8.1.14.v20131031 - compile - - - org.eclipse.jetty - jetty-util - - - - - - org.eclipse.jetty - jetty-servlet - 8.1.14.v20131031 - compile - - - org.eclipse.jetty - jetty-security - - - - - - org.eclipse.jetty - jetty-util - 8.1.14.v20131031 - compile org.eclipse.jetty jetty-websocket - 8.1.14.v20131031 - compile - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-io - - - org.eclipse.jetty - jetty-http - - - + + diff --git a/qpid/java/broker/pom.xml b/qpid/java/broker/pom.xml index 6eb51a4b2e..9761819542 100644 --- a/qpid/java/broker/pom.xml +++ b/qpid/java/broker/pom.xml @@ -16,132 +16,130 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT - 4.0.0 qpid-broker + 0.28-SNAPSHOT + Qpid Java Broker + Broker configuration and executable org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-common - 0.26-SNAPSHOT - compile + ${project.version} log4j log4j - ${log4j-version} - compile commons-cli commons-cli - 1.2 - compile org.apache.qpid qpid-broker-plugins-access-control - 0.26-SNAPSHOT + ${project.version} runtime org.apache.qpid qpid-broker-plugins-amqp-0-8-protocol - 0.26-SNAPSHOT + ${project.version} runtime org.apache.qpid qpid-broker-plugins-amqp-0-10-protocol - 0.26-SNAPSHOT + ${project.version} runtime org.apache.qpid qpid-broker-plugins-amqp-1-0-protocol - 0.26-SNAPSHOT + ${project.version} runtime org.apache.qpid qpid-broker-plugins-amqp-msg-conv-0-8-to-0-10 - 0.26-SNAPSHOT + ${project.version} runtime org.apache.qpid qpid-broker-plugins-amqp-msg-conv-0-8-to-1-0 - 0.26-SNAPSHOT + ${project.version} runtime org.apache.qpid qpid-broker-plugins-amqp-msg-conv-0-10-to-1-0 - 0.26-SNAPSHOT + ${project.version} runtime org.apache.qpid qpid-broker-plugins-derby-store - 0.26-SNAPSHOT + ${project.version} runtime org.apache.qpid qpid-broker-plugins-jdbc-provider-bone - 0.26-SNAPSHOT + ${project.version} runtime org.apache.qpid qpid-broker-plugins-jdbc-store - 0.26-SNAPSHOT + ${project.version} runtime org.apache.qpid qpid-broker-plugins-management-http - 0.26-SNAPSHOT + ${project.version} runtime org.apache.qpid qpid-broker-plugins-management-jmx - 0.26-SNAPSHOT + ${project.version} runtime org.apache.qpid qpid-broker-plugins-memory-store - 0.26-SNAPSHOT + ${project.version} runtime @@ -149,7 +147,7 @@ org.apache.qpid qpid-bdbstore - 0.26-SNAPSHOT + ${project.version} runtime true @@ -157,7 +155,7 @@ org.apache.qpid qpid-bdbstore-jmx - 0.26-SNAPSHOT + ${project.version} runtime true @@ -166,7 +164,7 @@ org.apache.qpid qpid-test-utils - 0.26-SNAPSHOT + ${project.version} test diff --git a/qpid/java/client/pom.xml b/qpid/java/client/pom.xml index 3d9508eb16..f5623ff53c 100644 --- a/qpid/java/client/pom.xml +++ b/qpid/java/client/pom.xml @@ -16,42 +16,42 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT - 4.0.0 qpid-client + 0.28-SNAPSHOT + Qpid AMQP 0.x JMS Client + JMS client supporting AMQP 0-8, 0-9, 0-9-1 and 0-10. org.apache.qpid qpid-common - 0.26-SNAPSHOT - compile + ${project.version} org.apache.geronimo.specs geronimo-jms_1.1_spec - 1.0 provided org.slf4j slf4j-api - ${slf4j-version} - compile org.apache.qpid qpid-test-utils - 0.26-SNAPSHOT + ${project.version} test diff --git a/qpid/java/common/pom.xml b/qpid/java/common/pom.xml index d931c799a3..7ea7f5907a 100644 --- a/qpid/java/common/pom.xml +++ b/qpid/java/common/pom.xml @@ -16,14 +16,18 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT - 4.0.0 qpid-common + 0.28-SNAPSHOT + Qpid Common + Common functionality @@ -37,15 +41,13 @@ org.slf4j slf4j-api - ${slf4j-version} - compile org.apache.qpid qpid-test-utils - 0.26-SNAPSHOT + ${project.version} test @@ -91,17 +93,17 @@ velocity velocity - 1.4 + ${velocity-version} velocity velocity-dep - 1.4 + ${velocity-version} org.python jython-standalone - 2.5.3 + ${jython-version} diff --git a/qpid/java/jca/pom.xml b/qpid/java/jca/pom.xml index c7a8de61fe..ecff05f95a 100644 --- a/qpid/java/jca/pom.xml +++ b/qpid/java/jca/pom.xml @@ -16,69 +16,65 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT - 4.0.0 qpid-jca + 0.28-SNAPSHOT + Qpid JCA + J2EE Connector Architecture code org.apache.qpid qpid-client - 0.26-SNAPSHOT + ${project.version} provided org.slf4j slf4j-api - ${slf4j-version} - compile org.apache.geronimo.specs geronimo-j2ee-connector_1.5_spec - 2.0.0 provided org.apache.geronimo.specs geronimo-jta_1.1_spec - 1.1.1 provided org.apache.geronimo.specs geronimo-jms_1.1_spec - 1.0 provided org.apache.geronimo.specs geronimo-ejb_3.0_spec - 1.0.1 provided org.apache.geronimo.specs geronimo-servlet_3.0_spec - 1.0 provided org.apache.geronimo.framework geronimo-kernel - 2.2.1 provided @@ -116,7 +112,7 @@ org.apache.qpid qpid-test-utils - 0.26-SNAPSHOT + ${project.version} test diff --git a/qpid/java/jca/rar/pom.xml b/qpid/java/jca/rar/pom.xml index fca35dba14..1f1aa5e6e0 100644 --- a/qpid/java/jca/rar/pom.xml +++ b/qpid/java/jca/rar/pom.xml @@ -16,22 +16,26 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT ../../pom.xml - 4.0.0 qpid-ra + 0.28-SNAPSHOT rar + Qpid Resource Adaptor + Resource Adaptor org.apache.qpid qpid-client - 0.26-SNAPSHOT + ${project.version} runtime @@ -44,7 +48,7 @@ org.apache.qpid qpid-jca - 0.26-SNAPSHOT + ${project.version} runtime @@ -63,30 +67,4 @@ - diff --git a/qpid/java/management/common/pom.xml b/qpid/java/management/common/pom.xml index ad5d103165..e08338ff8e 100644 --- a/qpid/java/management/common/pom.xml +++ b/qpid/java/management/common/pom.xml @@ -16,15 +16,19 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT ../../pom.xml - 4.0.0 qpid-management-common + 0.28-SNAPSHOT + Qpid Management Common + Common management code diff --git a/qpid/java/management/example/pom.xml b/qpid/java/management/example/pom.xml index bdddc3d2dc..d70d16c647 100644 --- a/qpid/java/management/example/pom.xml +++ b/qpid/java/management/example/pom.xml @@ -16,22 +16,25 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT ../../pom.xml - 4.0.0 qpid-management-examples + 0.28-SNAPSHOT + Qpid Management Examples + Example management code org.apache.qpid qpid-management-common - 0.26-SNAPSHOT - compile + ${project.version} diff --git a/qpid/java/perftests/pom.xml b/qpid/java/perftests/pom.xml index 2a1dbd4350..ce60b13703 100644 --- a/qpid/java/perftests/pom.xml +++ b/qpid/java/perftests/pom.xml @@ -16,14 +16,18 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT - 4.0.0 qpid-perftests + 0.28-SNAPSHOT + Qpid Performance Tests + Performance testing configuration, code and tests target${file.separator}qpid-broker${file.separator}${project.version} @@ -37,28 +41,22 @@ org.apache.qpid qpid-client - 0.26-SNAPSHOT - compile + ${project.version} log4j log4j - ${log4j-version} - compile org.slf4j slf4j-api - ${slf4j-version} - compile org.apache.geronimo.specs geronimo-jms_1.1_spec - 1.0 provided @@ -66,35 +64,26 @@ commons-lang commons-lang - 2.6 - compile commons-collections commons-collections - 3.2.1 - compile commons-beanutils commons-beanutils-core - 1.8.3 - compile com.google.code.gson gson - 2.0 - compile org.apache.derby derby - 10.8.2.2 runtime @@ -102,14 +91,14 @@ org.apache.qpid qpid-systests - 0.26-SNAPSHOT + ${project.version} test org.apache.qpid qpid-test-utils - 0.26-SNAPSHOT + ${project.version} test diff --git a/qpid/java/perftests/visualisation-jfc/pom.xml b/qpid/java/perftests/visualisation-jfc/pom.xml index d677491a03..ea0979de39 100644 --- a/qpid/java/perftests/visualisation-jfc/pom.xml +++ b/qpid/java/perftests/visualisation-jfc/pom.xml @@ -16,35 +16,35 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT ../../pom.xml - 4.0.0 qpid-perftests-visualisation-jfc + 0.28-SNAPSHOT + Qpid Performance Tests Visualisation JFC + Performance testing visualisation using JFreeChart org.apache.qpid qpid-perftests - 0.26-SNAPSHOT - compile + ${project.version} org.slf4j slf4j-api - ${slf4j-version} - compile org.apache.derby derby - 10.8.2.2 runtime @@ -52,14 +52,14 @@ net.sourceforge.csvjdbc csvjdbc - 1.0.8 + ${csvjdbc-version} provided jfree jfreechart - 1.0.13 + ${jfreechart-version} provided @@ -67,7 +67,7 @@ org.apache.qpid qpid-test-utils - 0.26-SNAPSHOT + ${project.version} test @@ -109,4 +109,17 @@ + + + csvjdbc.releases + http://csvjdbc.sourceforge.net/maven2 + default + + true + + + false + + + diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml index 54395ed4fe..3eb4cfb8c0 100644 --- a/qpid/java/pom.xml +++ b/qpid/java/pom.xml @@ -16,47 +16,56 @@ limitations under the License. --> + 4.0.0 + org.apache apache 12 - 4.0.0 org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT pom - + Qpid + http://qpid.apache.org + Apache Qpid™ makes messaging tools that speak AMQP and support many languages and platforms. AMQP is an open internet protocol for reliably sending and receiving messages. It makes it possible for everyone to build a diverse, coherent messaging ecosystem. + + + JIRA + https://issues.apache.org/jira/browse/QPID + + + + Jenkins + https://builds.apache.org/view/M-R/view/Qpid/ + + + + + Apache Qpid Users + users-subscribe@qpid.apache.org + users-unsubscribe@qpid.apache.org + users@qpid.apache.org + http://mail-archives.apache.org/mod_mbox/qpid-users/ + + + Apache Qpid Developers + dev-subscribe@qpid.apache.org + dev-unsubscribe@qpid.apache.org + dev@qpid.apache.org + http://mail-archives.apache.org/mod_mbox/qpid-dev/ + + + + + scm:svn:http://svn.apache.org/repos/asf/qpid/trunk/qpid/java + scm:svn:https://svn.apache.org/repos/asf/qpid/trunk/qpid/java + http://svn.apache.org/viewvc/qpid/trunk/qpid/java + + 3.0.0 @@ -64,12 +73,39 @@ 1.9.1 + 1.2.16 + 1.6.4 + 8.1.14.v20131031 + 1.9.1 + 5.0.97 + 2.0 + 14.0.1 + 0.7.1.RELEASE + 1.8.3 + 1.2 + 1.6 + 3.2.1 + 1.8 + 1.8.1 + 2.6 + 1.1.1 + 1.0 + 1.1.1 + 1.0 + 2.0.0 + 1.0.1 + 2.2.1 + 2.7.0 + 5.2 + 1.4 + 10.8.2.2 + 2.5.3 + 1.0.8 + 1.0.13 3.8.1 1.9.0 - 1.2.16 - 1.6.4 1.7 @@ -105,7 +141,7 @@ 1.6 - (java-mms.0-9-1|java-mms.0-10) + (java-mms.0-9-1|java-mms.0-10|java-bdb.0-10) ${basedir} @@ -120,30 +156,13 @@ ${profile.excludes.java-mms.0-10} - - - junit - junit - ${junit-version} - test - - - - org.mockito - mockito-all - ${mockito-version} - test - - - - + amqp-1-0-common amqp-1-0-client amqp-1-0-client-jms amqp-1-0-client-websocket - amqp-1-0-common - broker broker-core + broker broker-plugins/access-control broker-plugins/amqp-0-8-protocol broker-plugins/amqp-0-10-protocol @@ -177,32 +196,263 @@ bdbstore/systests - - - - oracle.releases - http://download.oracle.com/maven - default - - true - - - false - - - - - csvjdbc.releases - http://csvjdbc.sourceforge.net/maven2 - default - - true - - - false - - - + + + junit + junit + test + + + + org.mockito + mockito-all + test + + + + + + + + junit + junit + ${junit-version} + test + + + + org.mockito + mockito-all + ${mockito-version} + test + + + + log4j + log4j + ${log4j-version} + compile + + + + org.slf4j + slf4j-api + ${slf4j-version} + compile + + + + org.slf4j + slf4j-log4j12 + ${slf4j-version} + compile + + + + org.eclipse.jetty + jetty-server + ${jetty-version} + compile + + + + org.eclipse.jetty + jetty-websocket + ${jetty-version} + compile + + + + org.eclipse.jetty + jetty-servlet + ${jetty-version} + compile + + + + org.codehaus.jackson + jackson-core-asl + ${jackson-version} + compile + + + + org.codehaus.jackson + jackson-mapper-asl + ${jackson-version} + compile + + + + org.dojotoolkit + dojo + ${dojo-version} + compile + + + + com.sleepycat + je + ${bdb-version} + compile + + + + commons-beanutils + commons-beanutils-core + ${commons-beanutils-version} + compile + + + + commons-digester + commons-digester + ${commons-digester-version} + compile + + + + commons-lang + commons-lang + ${commons-lang-version} + compile + + + + commons-cli + commons-cli + ${commons-cli-version} + compile + + + + commons-codec + commons-codec + ${commons-codec-version} + compile + + + + commons-collections + commons-collections + ${commons-collections-version} + compile + + + + commons-configuration + commons-configuration + ${commons-configuration-version} + compile + + + + commons-logging + commons-logging + ${commons-logging-version} + compile + + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + ${geronimo-jms-version} + provided + + + + org.apache.geronimo.specs + geronimo-jta_1.1_spec + ${geronimo-gta-version} + provided + + + + org.apache.geronimo.specs + geronimo-servlet_3.0_spec + ${geronimo-servlet-version} + compile + + + + org.apache.geronimo.specs + geronimo-j2ee-connector_1.5_spec + ${geronimo-j2ee-connector-version} + compile + + + + org.apache.geronimo.specs + geronimo-ejb_3.0_spec + ${geronimo-ejb-version} + provided + + + + org.apache.geronimo.framework + geronimo-kernel + ${geronimo-kernel-version} + provided + + + + xalan + xalan + ${xalan-version} + compile + + + + org.apache.bcel + bcel + ${bcel-version} + compile + + + + velocity + velocity + ${velocity-version} + compile + + + + velocity + velocity-dep + ${velocity-version} + compile + + + + org.apache.derby + derby + ${derby-version} + compile + + + + com.google.guava + guava + ${guava-version} + compile + + + + com.jolbox + bonecp + ${bonecp-version} + compile + + + + com.google.code.gson + gson + ${gson-version} + compile + + + + @@ -497,41 +747,6 @@ - - Apache Qpid™ makes messaging tools that speak AMQP and support many languages and platforms. - AMQP is an open internet protocol for reliably sending and receiving messages. It makes it possible for everyone to build a diverse, coherent messaging ecosystem. - - - http://qpid.apache.org - - - JIRA - https://issues.apache.org/jira/browse/QPID - - - - - Apache Qpid Users - users-subscribe@qpid.apache.org - users-unsubscribe@qpid.apache.org - users@qpid.apache.org - http://mail-archives.apache.org/mod_mbox/qpid-users/ - - - Apache Qpid Developers - dev-subscribe@qpid.apache.org - dev-unsubscribe@qpid.apache.org - dev@qpid.apache.org - http://mail-archives.apache.org/mod_mbox/qpid-dev/ - - - - - scm:svn:http://svn.apache.org/repos/asf/qpid/trunk/qpid - scm:svn:https://svn.apache.org/repos/asf/qpid/trunk/qpid - http://svn.apache.org/viewvc/qpid/ - - @@ -548,6 +763,21 @@ + + + + oracle.releases + http://download.oracle.com/maven + default + + true + + + false + + + + + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT - 4.0.0 qpid-test-utils + 0.28-SNAPSHOT + Qpid Test Utilities + Testing utilities junit junit - ${junit-version} compile log4j log4j - ${log4j-version} - compile org.slf4j slf4j-api - ${slf4j-version} - compile org.slf4j slf4j-log4j12 - ${slf4j-version} - compile org.apache.geronimo.specs geronimo-jms_1.1_spec - 1.0 provided diff --git a/qpid/java/systests/pom.xml b/qpid/java/systests/pom.xml index 98086bbe9e..a556841240 100644 --- a/qpid/java/systests/pom.xml +++ b/qpid/java/systests/pom.xml @@ -16,14 +16,18 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT - 4.0.0 qpid-systests + 0.28-SNAPSHOT + Qpid System Tests + System testing configuration, code and tests target${file.separator}qpid-broker${file.separator}${project.version} @@ -51,36 +55,29 @@ org.apache.qpid qpid-test-utils - 0.26-SNAPSHOT - compile + ${project.version} log4j log4j - ${log4j-version} - compile org.slf4j slf4j-api - ${slf4j-version} - compile org.apache.qpid qpid-client - 0.26-SNAPSHOT - compile + ${project.version} org.apache.geronimo.specs geronimo-jms_1.1_spec - 1.0 provided @@ -88,21 +85,17 @@ org.apache.qpid qpid-jca - 0.26-SNAPSHOT - compile + ${project.version} org.apache.geronimo.specs geronimo-j2ee-connector_1.5_spec - 2.0.0 - compile org.apache.geronimo.specs geronimo-jta_1.1_spec - 1.1.1 runtime @@ -110,125 +103,117 @@ org.apache.qpid qpid-broker - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-broker-core - 0.26-SNAPSHOT + ${project.version} test-jar - compile org.apache.qpid qpid-broker-plugins-access-control - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-broker-plugins-amqp-0-8-protocol - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-broker-plugins-amqp-0-10-protocol - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-broker-plugins-amqp-1-0-protocol - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-broker-plugins-amqp-msg-conv-0-8-to-0-10 - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-broker-plugins-amqp-msg-conv-0-8-to-1-0 - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-broker-plugins-amqp-msg-conv-0-10-to-1-0 - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-broker-plugins-derby-store - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-broker-plugins-jdbc-provider-bone - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-broker-plugins-jdbc-store - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-broker-plugins-management-http - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-broker-plugins-management-jmx - 0.26-SNAPSHOT - compile + ${project.version} org.apache.qpid qpid-broker-plugins-memory-store - 0.26-SNAPSHOT - compile + ${project.version} - + + diff --git a/qpid/java/tools/pom.xml b/qpid/java/tools/pom.xml index 0afaa1d274..9da9ca0443 100644 --- a/qpid/java/tools/pom.xml +++ b/qpid/java/tools/pom.xml @@ -16,42 +16,39 @@ limitations under the License. --> + 4.0.0 + org.apache.qpid - qpid-project - 0.26-SNAPSHOT + qpid-parent + 1.0-SNAPSHOT - 4.0.0 qpid-tools + 0.28-SNAPSHOT + Qpid Tools + Tools org.apache.qpid qpid-client - 0.26-SNAPSHOT - compile + ${project.version} log4j log4j - ${log4j-version} - compile org.slf4j slf4j-api - ${slf4j-version} - compile org.apache.geronimo.specs geronimo-jms_1.1_spec - 1.0 - compile -- cgit v1.2.1