From 499269cd18d32d685b9ec5c9acacbbcf1b47d4f6 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Mon, 30 Sep 2013 22:10:04 +0000 Subject: QPID-5048: add pluginManagement section to the qpid parent, to override apache parent versions as desired and set any additional config. Sets the compiler source+target values in parent and removes unecessary duplicate compiler plugin config from child modules. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1527797 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/amqp-1-0-client-jms/pom.xml | 15 +- qpid/java/amqp-1-0-client/pom.xml | 14 -- qpid/java/amqp-1-0-common/pom.xml | 14 -- qpid/java/bdbstore/jmx/pom.xml | 14 -- qpid/java/bdbstore/pom.xml | 14 -- qpid/java/bdbstore/systests/pom.xml | 21 +-- qpid/java/broker-core/pom.xml | 19 +- qpid/java/broker-plugins/access-control/pom.xml | 15 -- .../java/broker-plugins/amqp-0-10-protocol/pom.xml | 14 -- qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml | 14 -- qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml | 14 -- .../amqp-msg-conv-0-10-to-1-0/pom.xml | 14 -- .../amqp-msg-conv-0-8-to-0-10/pom.xml | 14 -- .../amqp-msg-conv-0-8-to-1-0/pom.xml | 14 -- qpid/java/broker-plugins/derby-store/pom.xml | 14 -- .../java/broker-plugins/jdbc-provider-bone/pom.xml | 14 -- qpid/java/broker-plugins/jdbc-store/pom.xml | 14 -- qpid/java/broker-plugins/management-http/pom.xml | 15 +- qpid/java/broker-plugins/management-jmx/pom.xml | 14 -- qpid/java/broker-plugins/memory-store/pom.xml | 16 -- qpid/java/broker/pom.xml | 15 +- qpid/java/client/pom.xml | 15 +- qpid/java/common/pom.xml | 17 +- qpid/java/jca/pom.xml | 14 -- qpid/java/jca/rar/pom.xml | 15 +- qpid/java/management/common/pom.xml | 28 --- qpid/java/management/example/pom.xml | 15 +- qpid/java/perftests/pom.xml | 24 +-- qpid/java/perftests/visualisation-jfc/pom.xml | 15 +- qpid/java/pom.xml | 199 ++++++++++++++++++++- qpid/java/qpid-test-utils/pom.xml | 14 -- qpid/java/systests/pom.xml | 20 +-- qpid/java/tools/pom.xml | 15 +- 33 files changed, 220 insertions(+), 483 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 03e0bbfff2..33103b561a 100644 --- a/qpid/java/amqp-1-0-client-jms/pom.xml +++ b/qpid/java/amqp-1-0-client-jms/pom.xml @@ -51,23 +51,10 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - org.apache.maven.plugins maven-assembly-plugin - + src/main/assembly/qpid-amqp-1-0-client-jms-bin.xml diff --git a/qpid/java/amqp-1-0-client/pom.xml b/qpid/java/amqp-1-0-client/pom.xml index 6c3c0fd1d2..a54d813306 100644 --- a/qpid/java/amqp-1-0-client/pom.xml +++ b/qpid/java/amqp-1-0-client/pom.xml @@ -36,20 +36,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - diff --git a/qpid/java/amqp-1-0-common/pom.xml b/qpid/java/amqp-1-0-common/pom.xml index a40319e159..688dd82350 100644 --- a/qpid/java/amqp-1-0-common/pom.xml +++ b/qpid/java/amqp-1-0-common/pom.xml @@ -27,20 +27,6 @@ qpid-amqp-1-0-common - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - diff --git a/qpid/java/bdbstore/jmx/pom.xml b/qpid/java/bdbstore/jmx/pom.xml index 7ac68d2d02..243903c8c4 100644 --- a/qpid/java/bdbstore/jmx/pom.xml +++ b/qpid/java/bdbstore/jmx/pom.xml @@ -74,20 +74,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - diff --git a/qpid/java/bdbstore/pom.xml b/qpid/java/bdbstore/pom.xml index 8df390c9bd..34b108d6d7 100644 --- a/qpid/java/bdbstore/pom.xml +++ b/qpid/java/bdbstore/pom.xml @@ -87,20 +87,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - diff --git a/qpid/java/bdbstore/systests/pom.xml b/qpid/java/bdbstore/systests/pom.xml index da7cf1acb3..3b7aa61943 100644 --- a/qpid/java/bdbstore/systests/pom.xml +++ b/qpid/java/bdbstore/systests/pom.xml @@ -94,23 +94,10 @@ src/main/java - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - org.apache.maven.plugins maven-surefire-plugin - + ${basedir}/../.. + @@ -183,7 +169,7 @@ org.apache.maven.plugins maven-dependency-plugin - + extract-broker-distribution @@ -207,7 +193,6 @@ - diff --git a/qpid/java/broker-core/pom.xml b/qpid/java/broker-core/pom.xml index 0e5f486803..aa8bc71da1 100644 --- a/qpid/java/broker-core/pom.xml +++ b/qpid/java/broker-core/pom.xml @@ -184,23 +184,10 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - org.apache.maven.plugins maven-jar-plugin - + @@ -213,7 +200,7 @@ org.apache.maven.plugins maven-surefire-plugin - + ${basedir}/.. @@ -235,7 +222,7 @@ org.apache.maven.plugins maven-antrun-plugin - + generate-sources-broker-core diff --git a/qpid/java/broker-plugins/access-control/pom.xml b/qpid/java/broker-plugins/access-control/pom.xml index b8d601d6f2..93b83897f3 100644 --- a/qpid/java/broker-plugins/access-control/pom.xml +++ b/qpid/java/broker-plugins/access-control/pom.xml @@ -71,21 +71,6 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - 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 16a27d2b1c..c3aeb7c93a 100644 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml @@ -53,20 +53,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - 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 762e61a341..23af0e6502 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml @@ -53,20 +53,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - 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 c31b414bce..2825d3846e 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml @@ -44,20 +44,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - 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 3f290849b3..9bf96cb6bd 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 @@ -65,20 +65,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - 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 7afd15f096..afbfc7dab0 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 @@ -58,20 +58,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - 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 b717117188..9007b0a47a 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 @@ -65,20 +65,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - diff --git a/qpid/java/broker-plugins/derby-store/pom.xml b/qpid/java/broker-plugins/derby-store/pom.xml index 155fd62bc1..b491ce4b02 100644 --- a/qpid/java/broker-plugins/derby-store/pom.xml +++ b/qpid/java/broker-plugins/derby-store/pom.xml @@ -60,20 +60,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml b/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml index 990cf8d684..2ed148be25 100644 --- a/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml +++ b/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml @@ -59,20 +59,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - diff --git a/qpid/java/broker-plugins/jdbc-store/pom.xml b/qpid/java/broker-plugins/jdbc-store/pom.xml index edb6416c25..3b7926ed82 100644 --- a/qpid/java/broker-plugins/jdbc-store/pom.xml +++ b/qpid/java/broker-plugins/jdbc-store/pom.xml @@ -60,20 +60,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - diff --git a/qpid/java/broker-plugins/management-http/pom.xml b/qpid/java/broker-plugins/management-http/pom.xml index eb5ace88da..f7942f85fa 100644 --- a/qpid/java/broker-plugins/management-http/pom.xml +++ b/qpid/java/broker-plugins/management-http/pom.xml @@ -173,23 +173,10 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - org.apache.maven.plugins maven-dependency-plugin - 2.8 + unpack-dojo diff --git a/qpid/java/broker-plugins/management-jmx/pom.xml b/qpid/java/broker-plugins/management-jmx/pom.xml index 01b50a65e2..a55ba64ef1 100644 --- a/qpid/java/broker-plugins/management-jmx/pom.xml +++ b/qpid/java/broker-plugins/management-jmx/pom.xml @@ -52,20 +52,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - diff --git a/qpid/java/broker-plugins/memory-store/pom.xml b/qpid/java/broker-plugins/memory-store/pom.xml index 3cd916f07b..a0cba5d38d 100644 --- a/qpid/java/broker-plugins/memory-store/pom.xml +++ b/qpid/java/broker-plugins/memory-store/pom.xml @@ -37,22 +37,6 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - - diff --git a/qpid/java/broker/pom.xml b/qpid/java/broker/pom.xml index 0b1e5a6075..846b238626 100644 --- a/qpid/java/broker/pom.xml +++ b/qpid/java/broker/pom.xml @@ -174,23 +174,10 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - org.apache.maven.plugins maven-assembly-plugin - + src/main/assembly/qpid-broker-bin.xml diff --git a/qpid/java/client/pom.xml b/qpid/java/client/pom.xml index 6e4d8ef324..12110441ce 100644 --- a/qpid/java/client/pom.xml +++ b/qpid/java/client/pom.xml @@ -90,23 +90,10 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - org.apache.maven.plugins maven-assembly-plugin - + src/main/assembly/qpid-client-bin.xml diff --git a/qpid/java/common/pom.xml b/qpid/java/common/pom.xml index bf944df901..437127af82 100644 --- a/qpid/java/common/pom.xml +++ b/qpid/java/common/pom.xml @@ -72,23 +72,10 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - org.apache.maven.plugins maven-antrun-plugin - + amqp-0-8-generated @@ -142,7 +129,7 @@ org.codehaus.mojo javacc-maven-plugin - 2.6 + jms-selector-generated diff --git a/qpid/java/jca/pom.xml b/qpid/java/jca/pom.xml index 5c21dfc551..f1c4ec5de3 100644 --- a/qpid/java/jca/pom.xml +++ b/qpid/java/jca/pom.xml @@ -108,20 +108,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - diff --git a/qpid/java/jca/rar/pom.xml b/qpid/java/jca/rar/pom.xml index 936ce4d57d..ea8a4c9143 100644 --- a/qpid/java/jca/rar/pom.xml +++ b/qpid/java/jca/rar/pom.xml @@ -52,23 +52,10 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - org.apache.maven.plugins maven-rar-plugin - 2.3 + src/main/resources/META-INF/ra.xml src/main/resources diff --git a/qpid/java/management/common/pom.xml b/qpid/java/management/common/pom.xml index ee8fcabb83..2489dd0680 100644 --- a/qpid/java/management/common/pom.xml +++ b/qpid/java/management/common/pom.xml @@ -28,37 +28,9 @@ qpid-management-common - - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - diff --git a/qpid/java/management/example/pom.xml b/qpid/java/management/example/pom.xml index 351d19aef5..c5fd6566d8 100644 --- a/qpid/java/management/example/pom.xml +++ b/qpid/java/management/example/pom.xml @@ -38,23 +38,10 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - org.apache.maven.plugins maven-deploy-plugin - + true diff --git a/qpid/java/perftests/pom.xml b/qpid/java/perftests/pom.xml index a83d5eb815..455c69beda 100644 --- a/qpid/java/perftests/pom.xml +++ b/qpid/java/perftests/pom.xml @@ -50,7 +50,6 @@ - org.slf4j slf4j-api @@ -150,23 +149,10 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - org.apache.maven.plugins maven-deploy-plugin - + true @@ -175,7 +161,7 @@ org.apache.maven.plugins maven-assembly-plugin - + src/main/assembly/qpid-perftests-bin.xml @@ -195,7 +181,7 @@ org.apache.maven.plugins maven-resources-plugin - + @@ -243,7 +229,7 @@ org.apache.maven.plugins maven-dependency-plugin - + extract-broker-distribution @@ -271,7 +257,7 @@ org.apache.maven.plugins maven-surefire-plugin - + ${basedir}/.. diff --git a/qpid/java/perftests/visualisation-jfc/pom.xml b/qpid/java/perftests/visualisation-jfc/pom.xml index 5d6c288a3e..5f0394f2f6 100644 --- a/qpid/java/perftests/visualisation-jfc/pom.xml +++ b/qpid/java/perftests/visualisation-jfc/pom.xml @@ -99,23 +99,10 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - org.apache.maven.plugins maven-deploy-plugin - + true diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml index c71def7d40..312dd58ca9 100644 --- a/qpid/java/pom.xml +++ b/qpid/java/pom.xml @@ -61,10 +61,38 @@ --> - + 3.8.1 1.9.0 + + 1.7 + 2.4 + 2.5 + 3.1 + 2.7 + 1.0 + 1.3.1 + 2.16 + 1.4 + 2.5 + 1.8 + 2.4 + 2.9.1 + 3.2 + 2.3.2 + 1.5 + 2.6 + 1.8 + 1.0-beta-2 + 3.3 + 2.2.1 + 0.10 + 2.6 + 2.8 + 2.6 + 2.3 + 1.6 1.6 @@ -152,11 +180,176 @@ + + + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin-version} + + + org.apache.maven.plugins + maven-assembly-plugin + ${maven-assembly-plugin-version} + + + org.apache.maven.plugins + maven-clean-plugin + ${maven-clean-plugin-version} + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin-version} + + ${java.source} + ${java.target} + true + true + true + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven-deploy-plugin-version} + + + org.apache.maven.plugins + maven-docck-plugin + ${maven-docck-plugin-version} + + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven-enforcer-plugin-version} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven-failsafe-and-surefire-plugins-version} + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven-gpg-plugin-version} + + + org.apache.maven.plugins + maven-install-plugin + ${maven-install-plugin-version} + + + org.apache.maven.plugins + maven-invoker-plugin + ${maven-invoker-plugin-version} + + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin-version} + + + + true + true + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin-version} + + + org.apache.maven.plugins + maven-plugin-plugin + ${maven-plugin-plugin-version} + + + + org.apache.maven.plugins + maven-release-plugin + ${maven-release-plugin-version} + + false + deploy + -Papache-release ${arguments} + + + + + org.apache.maven.plugins + maven-remote-resources-plugin + ${maven-remote-resources-plugin-version} + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin-version} + + + org.apache.maven.plugins + maven-scm-plugin + ${maven-scm-plugin-version} + + + org.apache.maven.plugins + maven-scm-publish-plugin + ${maven-scm-publish-plugin-version} + + + org.apache.maven.plugins + maven-site-plugin + ${maven-site-plugin-version} + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin-version} + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-failsafe-and-surefire-plugins-version} + + + org.apache.rat + apache-rat-plugin + ${apache-rat-plugin-version} + + + org.codehaus.mojo + clirr-maven-plugin + ${clirr-maven-plugin-version} + + + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin-version} + + + org.codehaus.mojo + javacc-maven-plugin + ${javacc-maven-plugin-version} + + + org.apache.maven.plugins + maven-rar-plugin + ${maven-rar-plugin-version} + + + + org.apache.maven.plugins maven-antrun-plugin - + create-qbtc-output-dir @@ -176,7 +369,7 @@ org.apache.maven.plugins maven-surefire-plugin - + **/*Test.java diff --git a/qpid/java/qpid-test-utils/pom.xml b/qpid/java/qpid-test-utils/pom.xml index 9173978764..6ab08c90d6 100644 --- a/qpid/java/qpid-test-utils/pom.xml +++ b/qpid/java/qpid-test-utils/pom.xml @@ -50,20 +50,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - diff --git a/qpid/java/systests/pom.xml b/qpid/java/systests/pom.xml index f1b8d85015..6dc319570b 100644 --- a/qpid/java/systests/pom.xml +++ b/qpid/java/systests/pom.xml @@ -234,23 +234,10 @@ src/main/java - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - org.apache.maven.plugins maven-surefire-plugin - + ${basedir}/.. + @@ -322,7 +309,7 @@ org.apache.maven.plugins maven-dependency-plugin - + extract-broker-distribution @@ -346,7 +333,6 @@ - diff --git a/qpid/java/tools/pom.xml b/qpid/java/tools/pom.xml index daa0973c1a..9c55a9e0f9 100644 --- a/qpid/java/tools/pom.xml +++ b/qpid/java/tools/pom.xml @@ -51,23 +51,10 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - ${java.source} - ${java.target} - true - true - true - - - org.apache.maven.plugins maven-deploy-plugin - + true -- cgit v1.2.1