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/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 ++------------------- 14 files changed, 140 insertions(+), 325 deletions(-) (limited to 'qpid/java/broker-plugins') 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 - - - + + -- cgit v1.2.1