From 1609463a312eb0e6287f7333c7cf4fb75d658e76 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Fri, 28 Feb 2014 12:27:02 +0000 Subject: QPID-5048: Maven enahancements to remove child version definitions and improve profile handling for sys tests Patch supplied by Andrew MacBean git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1572933 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/amqp-1-0-client-jms/pom.xml | 1 - qpid/java/amqp-1-0-client-websocket/pom.xml | 1 - qpid/java/amqp-1-0-client/pom.xml | 1 - qpid/java/amqp-1-0-common/pom.xml | 1 - qpid/java/bdbstore/jmx/pom.xml | 1 - qpid/java/bdbstore/pom.xml | 1 - qpid/java/bdbstore/systests/pom.xml | 1 - qpid/java/broker-core/pom.xml | 1 - qpid/java/broker-plugins/access-control/pom.xml | 1 - qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml | 1 - qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml | 1 - qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml | 1 - qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml | 1 - qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml | 1 - qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml | 1 - qpid/java/broker-plugins/derby-store/pom.xml | 1 - qpid/java/broker-plugins/jdbc-provider-bone/pom.xml | 1 - qpid/java/broker-plugins/jdbc-store/pom.xml | 1 - qpid/java/broker-plugins/management-amqp/pom.xml | 1 - qpid/java/broker-plugins/management-http/pom.xml | 1 - qpid/java/broker-plugins/management-jmx/pom.xml | 1 - qpid/java/broker-plugins/memory-store/pom.xml | 1 - qpid/java/broker-plugins/websocket/pom.xml | 1 - qpid/java/broker/pom.xml | 1 - qpid/java/client/pom.xml | 1 - qpid/java/common/pom.xml | 1 - qpid/java/jca/pom.xml | 1 - qpid/java/jca/rar/pom.xml | 1 - qpid/java/management/common/pom.xml | 1 - qpid/java/management/example/pom.xml | 1 - qpid/java/perftests/pom.xml | 1 - qpid/java/perftests/visualisation-jfc/pom.xml | 1 - qpid/java/pom.xml | 11 ++++++++++- qpid/java/qpid-test-utils/pom.xml | 1 - qpid/java/systests/pom.xml | 1 - qpid/java/tools/pom.xml | 1 - 36 files changed, 10 insertions(+), 36 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 57190f5c1e..bb3c65b8be 100644 --- a/qpid/java/amqp-1-0-client-jms/pom.xml +++ b/qpid/java/amqp-1-0-client-jms/pom.xml @@ -25,7 +25,6 @@ qpid-amqp-1-0-client-jms - 0.28-SNAPSHOT Qpid AMQP 1.0 Client JMS AMQP 1.0 compliant JMS module diff --git a/qpid/java/amqp-1-0-client-websocket/pom.xml b/qpid/java/amqp-1-0-client-websocket/pom.xml index f25ae0056e..b960fb497b 100644 --- a/qpid/java/amqp-1-0-client-websocket/pom.xml +++ b/qpid/java/amqp-1-0-client-websocket/pom.xml @@ -25,7 +25,6 @@ qpid-amqp-1-0-client-websocket - 0.28-SNAPSHOT Qpid AMQP 1.0 Client WebSocket AMQP 1.0 compliant WebSocket module diff --git a/qpid/java/amqp-1-0-client/pom.xml b/qpid/java/amqp-1-0-client/pom.xml index 19515cc3f7..e6fc5d6d2b 100644 --- a/qpid/java/amqp-1-0-client/pom.xml +++ b/qpid/java/amqp-1-0-client/pom.xml @@ -25,7 +25,6 @@ qpid-amqp-1-0-client - 0.28-SNAPSHOT Qpid AMQP 1.0 Client AMQP 1.0 compliant client module diff --git a/qpid/java/amqp-1-0-common/pom.xml b/qpid/java/amqp-1-0-common/pom.xml index 7088e06f6f..0b732d45d5 100644 --- a/qpid/java/amqp-1-0-common/pom.xml +++ b/qpid/java/amqp-1-0-common/pom.xml @@ -25,7 +25,6 @@ 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 a16ddfcf09..bd0757caf3 100644 --- a/qpid/java/bdbstore/jmx/pom.xml +++ b/qpid/java/bdbstore/jmx/pom.xml @@ -26,7 +26,6 @@ qpid-bdbstore-jmx - 0.28-SNAPSHOT Qpid BDB Message Store JMX BDB message store JMX implementation diff --git a/qpid/java/bdbstore/pom.xml b/qpid/java/bdbstore/pom.xml index b2079dd4e5..d7d12f0b33 100644 --- a/qpid/java/bdbstore/pom.xml +++ b/qpid/java/bdbstore/pom.xml @@ -25,7 +25,6 @@ qpid-bdbstore - 0.28-SNAPSHOT Qpid BDB Message Store BDB message store implementation using Oracle Berkeley DB Java Edition diff --git a/qpid/java/bdbstore/systests/pom.xml b/qpid/java/bdbstore/systests/pom.xml index eb15b2d3a3..e8620d3426 100644 --- a/qpid/java/bdbstore/systests/pom.xml +++ b/qpid/java/bdbstore/systests/pom.xml @@ -26,7 +26,6 @@ qpid-bdbstore-systests - 0.28-SNAPSHOT Qpid BDB Store System Tests BDB message store system tests diff --git a/qpid/java/broker-core/pom.xml b/qpid/java/broker-core/pom.xml index 17bff00507..a26e781da4 100644 --- a/qpid/java/broker-core/pom.xml +++ b/qpid/java/broker-core/pom.xml @@ -25,7 +25,6 @@ qpid-broker-core - 0.28-SNAPSHOT Qpid Java Broker Core Broker core functionality and initial configuration diff --git a/qpid/java/broker-plugins/access-control/pom.xml b/qpid/java/broker-plugins/access-control/pom.xml index 4aecd1c408..67fe9a3b3f 100644 --- a/qpid/java/broker-plugins/access-control/pom.xml +++ b/qpid/java/broker-plugins/access-control/pom.xml @@ -26,7 +26,6 @@ qpid-broker-plugins-access-control - 0.28-SNAPSHOT Qpid Access Control Broker Plug-in Access Control broker plug-in 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 10c31e94b5..575ddff828 100644 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml @@ -26,7 +26,6 @@ qpid-broker-plugins-amqp-0-10-protocol - 0.28-SNAPSHOT Qpid AMQP 0-10 Protocol Plug-in AMQP 0-10 protocol broker plug-in 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 e503c60919..6189201917 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml @@ -26,7 +26,6 @@ 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 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 ea4c830411..50be96b5f8 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml @@ -26,7 +26,6 @@ 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 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 e563640b16..666aab338e 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 @@ -26,7 +26,6 @@ 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 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 8d782ce8f3..9898834055 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 @@ -26,7 +26,6 @@ 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 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 5e8c229c35..957c4828cb 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 @@ -26,7 +26,6 @@ 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 diff --git a/qpid/java/broker-plugins/derby-store/pom.xml b/qpid/java/broker-plugins/derby-store/pom.xml index 3996fca753..8fa8ff8ec9 100644 --- a/qpid/java/broker-plugins/derby-store/pom.xml +++ b/qpid/java/broker-plugins/derby-store/pom.xml @@ -26,7 +26,6 @@ qpid-broker-plugins-derby-store - 0.28-SNAPSHOT Qpid Derby Message Store Apache Derby DB message store broker plug-in diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml b/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml index 89d4a024ea..95f7b23822 100644 --- a/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml +++ b/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml @@ -26,7 +26,6 @@ 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 diff --git a/qpid/java/broker-plugins/jdbc-store/pom.xml b/qpid/java/broker-plugins/jdbc-store/pom.xml index 729f837b66..7076b6ae50 100644 --- a/qpid/java/broker-plugins/jdbc-store/pom.xml +++ b/qpid/java/broker-plugins/jdbc-store/pom.xml @@ -26,7 +26,6 @@ qpid-broker-plugins-jdbc-store - 0.28-SNAPSHOT Qpid JDBC Message Store Broker Plug-in JDBC message store broker plug-in diff --git a/qpid/java/broker-plugins/management-amqp/pom.xml b/qpid/java/broker-plugins/management-amqp/pom.xml index 6e4e4e531c..b8aa40a72f 100644 --- a/qpid/java/broker-plugins/management-amqp/pom.xml +++ b/qpid/java/broker-plugins/management-amqp/pom.xml @@ -28,7 +28,6 @@ qpid-broker-plugins-management-amqp - 0.28-SNAPSHOT Qpid AMQP Management Protocol Broker Plug-in Qpid AMQP Management broker plug-in diff --git a/qpid/java/broker-plugins/management-http/pom.xml b/qpid/java/broker-plugins/management-http/pom.xml index 4ac560ed0a..4bfaf5e5d2 100644 --- a/qpid/java/broker-plugins/management-http/pom.xml +++ b/qpid/java/broker-plugins/management-http/pom.xml @@ -26,7 +26,6 @@ qpid-broker-plugins-management-http - 0.28-SNAPSHOT Qpid HTTP Management Broker Plug-in HTTP Management broker plug-in diff --git a/qpid/java/broker-plugins/management-jmx/pom.xml b/qpid/java/broker-plugins/management-jmx/pom.xml index db369c3b44..0f04f393c5 100644 --- a/qpid/java/broker-plugins/management-jmx/pom.xml +++ b/qpid/java/broker-plugins/management-jmx/pom.xml @@ -26,7 +26,6 @@ qpid-broker-plugins-management-jmx - 0.28-SNAPSHOT Qpid JMX Management Broker Plug-in JMX management broker plug-in diff --git a/qpid/java/broker-plugins/memory-store/pom.xml b/qpid/java/broker-plugins/memory-store/pom.xml index 3d0c31746c..b71574384e 100644 --- a/qpid/java/broker-plugins/memory-store/pom.xml +++ b/qpid/java/broker-plugins/memory-store/pom.xml @@ -26,7 +26,6 @@ qpid-broker-plugins-memory-store - 0.28-SNAPSHOT Qpid Memory Message Store Broker Plug-in Memory message store broker plug-in diff --git a/qpid/java/broker-plugins/websocket/pom.xml b/qpid/java/broker-plugins/websocket/pom.xml index a8ad25a459..49e08c94ec 100644 --- a/qpid/java/broker-plugins/websocket/pom.xml +++ b/qpid/java/broker-plugins/websocket/pom.xml @@ -26,7 +26,6 @@ qpid-broker-plugins-websocket - 0.28-SNAPSHOT Qpid WebSocket Broker Plug-in WebSocket broker plug-in diff --git a/qpid/java/broker/pom.xml b/qpid/java/broker/pom.xml index da0a52abe6..dc0b21610b 100644 --- a/qpid/java/broker/pom.xml +++ b/qpid/java/broker/pom.xml @@ -25,7 +25,6 @@ qpid-broker - 0.28-SNAPSHOT Qpid Java Broker Broker configuration and executable diff --git a/qpid/java/client/pom.xml b/qpid/java/client/pom.xml index 2f722e0bc6..f45007f413 100644 --- a/qpid/java/client/pom.xml +++ b/qpid/java/client/pom.xml @@ -25,7 +25,6 @@ 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. diff --git a/qpid/java/common/pom.xml b/qpid/java/common/pom.xml index d52cdaeef3..b71840be93 100644 --- a/qpid/java/common/pom.xml +++ b/qpid/java/common/pom.xml @@ -25,7 +25,6 @@ qpid-common - 0.28-SNAPSHOT Qpid Common Common functionality diff --git a/qpid/java/jca/pom.xml b/qpid/java/jca/pom.xml index 23c39f5dfa..afa30096f9 100644 --- a/qpid/java/jca/pom.xml +++ b/qpid/java/jca/pom.xml @@ -25,7 +25,6 @@ qpid-jca - 0.28-SNAPSHOT Qpid JCA J2EE Connector Architecture code diff --git a/qpid/java/jca/rar/pom.xml b/qpid/java/jca/rar/pom.xml index 5788b109cf..6454d8c304 100644 --- a/qpid/java/jca/rar/pom.xml +++ b/qpid/java/jca/rar/pom.xml @@ -26,7 +26,6 @@ qpid-ra - 0.28-SNAPSHOT rar Qpid Resource Adaptor Resource Adaptor diff --git a/qpid/java/management/common/pom.xml b/qpid/java/management/common/pom.xml index 94c9f4ad2f..e8c0bf069e 100644 --- a/qpid/java/management/common/pom.xml +++ b/qpid/java/management/common/pom.xml @@ -26,7 +26,6 @@ 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 6bda4fa62c..4d3d48fd78 100644 --- a/qpid/java/management/example/pom.xml +++ b/qpid/java/management/example/pom.xml @@ -26,7 +26,6 @@ qpid-management-examples - 0.28-SNAPSHOT Qpid Management Examples Example management code diff --git a/qpid/java/perftests/pom.xml b/qpid/java/perftests/pom.xml index 5350f8aaa1..1751f3f48a 100644 --- a/qpid/java/perftests/pom.xml +++ b/qpid/java/perftests/pom.xml @@ -26,7 +26,6 @@ qpid-perftests - 0.28-SNAPSHOT Qpid Performance Tests Performance testing configuration, code and tests diff --git a/qpid/java/perftests/visualisation-jfc/pom.xml b/qpid/java/perftests/visualisation-jfc/pom.xml index 92aac980ca..026b614d4b 100644 --- a/qpid/java/perftests/visualisation-jfc/pom.xml +++ b/qpid/java/perftests/visualisation-jfc/pom.xml @@ -26,7 +26,6 @@ qpid-perftests-visualisation-jfc - 0.28-SNAPSHOT Qpid Performance Tests Visualisation JFC Performance testing visualisation using JFreeChart diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml index fda9c2d6d8..7f2e2d8fda 100644 --- a/qpid/java/pom.xml +++ b/qpid/java/pom.xml @@ -224,7 +224,7 @@ ${profile.broker.virtualhosts-config} ${profile.broker.persistent} ${profile.messagestore.class.name} - + ${profile} ${qpid.home.qbtc.output} @@ -387,6 +387,7 @@ + java-mms.0-10 JavaTransientExcludes Java010Excludes v0_10 AMQP_1_0 @@ -405,6 +406,7 @@ + java-mms.0-9-1 JavaTransientExcludes XAExcludes JavaPre010Excludes v0_9_1 AMQP_1_0,AMQP_0_10 @@ -423,6 +425,7 @@ + java-mms.0-9 JavaTransientExcludes XAExcludes JavaPre010Excludes v0_9 AMQP_1_0,AMQP_0_10,AMQP_0_9_1 @@ -441,6 +444,7 @@ + java-bdb.0-10 JavaPersistentExcludes Java010Excludes JavaBDBExcludes v0_10 AMQP_1_0 @@ -459,6 +463,7 @@ + java-bdb.0-9-1 JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes v0_9_1 AMQP_1_0,AMQP_0_10 @@ -477,6 +482,7 @@ + java-bdb.0-9 JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes v0_9 AMQP_1_0,AMQP_0_10,AMQP_0_9_1 @@ -495,6 +501,7 @@ + java-dby-mem.0-10 JavaPersistentExcludes JavaDerbyExcludes Java010Excludes v0_10 AMQP_1_0 @@ -513,6 +520,7 @@ + java-dby-mem.0-9-1 JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes v0_9_1 AMQP_1_0,AMQP_0_10 @@ -531,6 +539,7 @@ + java-dby-mem.0-9 JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes v0_9 AMQP_1_0,AMQP_0_10,AMQP_0_9_1 diff --git a/qpid/java/qpid-test-utils/pom.xml b/qpid/java/qpid-test-utils/pom.xml index d96d0c0c02..dfc6496fe9 100644 --- a/qpid/java/qpid-test-utils/pom.xml +++ b/qpid/java/qpid-test-utils/pom.xml @@ -25,7 +25,6 @@ qpid-test-utils - 0.28-SNAPSHOT Qpid Test Utilities Testing utilities diff --git a/qpid/java/systests/pom.xml b/qpid/java/systests/pom.xml index 7107730255..319a3da5b2 100644 --- a/qpid/java/systests/pom.xml +++ b/qpid/java/systests/pom.xml @@ -26,7 +26,6 @@ qpid-systests - 0.28-SNAPSHOT Qpid System Tests System testing configuration, code and tests diff --git a/qpid/java/tools/pom.xml b/qpid/java/tools/pom.xml index c58e16c65e..547fc98cb5 100644 --- a/qpid/java/tools/pom.xml +++ b/qpid/java/tools/pom.xml @@ -25,7 +25,6 @@ qpid-tools - 0.28-SNAPSHOT Qpid Tools Tools -- cgit v1.2.1