diff options
| author | Robert Gemmell <robbie@apache.org> | 2013-09-30 22:10:04 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2013-09-30 22:10:04 +0000 |
| commit | 499269cd18d32d685b9ec5c9acacbbcf1b47d4f6 (patch) | |
| tree | 57860c4b15838f8391d59dc061048107371f13a4 /qpid/java | |
| parent | 1a231b61a54be40f49a3ab91d1bbfdff7b427090 (diff) | |
| download | qpid-python-499269cd18d32d685b9ec5c9acacbbcf1b47d4f6.tar.gz | |
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
Diffstat (limited to 'qpid/java')
33 files changed, 220 insertions, 483 deletions
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 @@ -53,21 +53,8 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <!--version is specified in the parent poms --> + <!--version specified in parent pluginManagement --> <configuration> <descriptors> <descriptor>src/main/assembly/qpid-amqp-1-0-client-jms-bin.xml</descriptor> 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 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - </plugins> </build> </project> 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 @@ <artifactId>qpid-amqp-1-0-common</artifactId> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - </plugins> </build> </project> 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 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - </plugins> </build> </project> 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 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - </plugins> </build> </project> 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 @@ -96,21 +96,8 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <!--version is specified in the parent poms --> + <!--version specified in parent pluginManagement --> <configuration> <workingDirectory>${basedir}/../..</workingDirectory> <!-- Skip the default test phase, bind to the @@ -131,11 +118,10 @@ </executions> </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <!--version is specified in the parent poms --> + <!--version specified in parent pluginManagement --> <executions> <!-- copy the systests config files into the ${qpid.home}/etc directory where the tests expect them --> @@ -183,7 +169,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <!--version is specified in the parent poms --> + <!--version specified in parent pluginManagement --> <executions> <execution> <id>extract-broker-distribution</id> @@ -207,7 +193,6 @@ </execution> </executions> </plugin> - </plugins> </build> 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 @@ -186,21 +186,8 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <!--version specified via parent poms --> + <!--version specified in parent pluginManagement --> <executions> <execution> <goals> @@ -213,7 +200,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <!--version specified in parent pom --> + <!--version specified in parent pluginManagement --> <configuration> <workingDirectory>${basedir}/..</workingDirectory> </configuration> @@ -235,7 +222,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <!--version is specified in the parent poms --> + <!--version specified in parent pluginManagement --> <executions> <execution> <id>generate-sources-broker-core</id> 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 @@ </includes> </resource> </resources> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - </plugins> </build> </project> 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 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - </plugins> </build> </project> 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 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - </plugins> </build> </project> 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 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - </plugins> </build> </project> 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 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - </plugins> </build> </project> 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 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - </plugins> </build> </project> 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 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - </plugins> </build> </project> 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 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - </plugins> </build> </project> 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 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - </plugins> </build> </project> 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 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - </plugins> </build> </project> 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 @@ </resources> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.8</version> + <!--version specified in parent pluginManagement --> <executions> <execution> <id>unpack-dojo</id> 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 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - </plugins> </build> </project> 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 @@ </dependencies> <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - - </plugins> </build> </project> 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 @@ -176,21 +176,8 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <!--version is specified in the parent poms --> + <!--version specified in parent pluginManagement --> <configuration> <descriptors> <descriptor>src/main/assembly/qpid-broker-bin.xml</descriptor> 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 @@ -92,21 +92,8 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <!--version is specified in the parent poms --> + <!--version specified in parent pluginManagement --> <configuration> <descriptors> <descriptor>src/main/assembly/qpid-client-bin.xml</descriptor> 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 @@ -74,21 +74,8 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version specified via parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <!--version specified via parent poms --> + <!--version specified in parent pluginManagement --> <executions> <execution> <id>amqp-0-8-generated</id> @@ -142,7 +129,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>javacc-maven-plugin</artifactId> - <version>2.6</version> + <!--version specified in parent pluginManagement --> <executions> <execution> <id>jms-selector-generated</id> 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 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - </plugins> </build> </project> 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 @@ -54,21 +54,8 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-rar-plugin</artifactId> - <version>2.3</version> + <!--version specified in parent pluginManagement --> <configuration> <raXmlFile>src/main/resources/META-INF/ra.xml</raXmlFile> <rarSourceDirectory>src/main/resources</rarSourceDirectory> 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 @@ <artifactId>qpid-management-common</artifactId> <dependencies> -<!-- - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.6.4</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - <scope>test</scope> - </dependency> --> </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version specified via parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - </plugins> </build> </project> 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 @@ -40,21 +40,8 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version specified via parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <!--version specified via parent poms --> + <!--version specified in parent pluginManagement --> <configuration> <skip>true</skip> </configuration> 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 @@ </dependency> <!-- logging deps --> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -152,21 +151,8 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <!--version specified via parent poms --> + <!--version specified in parent pluginManagement --> <configuration> <skip>true</skip> </configuration> @@ -175,7 +161,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <!--version is specified in the parent poms --> + <!--version specified in parent pluginManagement --> <configuration> <descriptors> <descriptor>src/main/assembly/qpid-perftests-bin.xml</descriptor> @@ -195,7 +181,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <!--version is specified in the parent poms --> + <!--version specified in parent pluginManagement --> <executions> <!-- copy the systests config files into the ${qpid.home}/etc directory where the tests expect them --> @@ -243,7 +229,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <!--version is specified in the parent poms --> + <!--version specified in parent pluginManagement --> <executions> <execution> <id>extract-broker-distribution</id> @@ -271,7 +257,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <!--version is specified in the parent poms --> + <!--version specified in parent pluginManagement --> <configuration> <workingDirectory>${basedir}/..</workingDirectory> <excludes> 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 @@ -101,21 +101,8 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <!--version specified via parent poms --> + <!--version specified in parent pluginManagement --> <configuration> <skip>true</skip> </configuration> 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 @@ --> <properties> - <!-- version properties --> + <!-- dependency version numbers --> <junit-version>3.8.1</junit-version> <mockito-version>1.9.0</mockito-version> + <!-- plugin version numbers --> + <maven-antrun-plugin-version>1.7</maven-antrun-plugin-version> + <maven-assembly-plugin-version>2.4</maven-assembly-plugin-version> + <maven-clean-plugin-version>2.5</maven-clean-plugin-version> + <maven-compiler-plugin-version>3.1</maven-compiler-plugin-version> + <maven-deploy-plugin-version>2.7</maven-deploy-plugin-version> + <maven-docck-plugin-version>1.0</maven-docck-plugin-version> + <maven-enforcer-plugin-version>1.3.1</maven-enforcer-plugin-version> + <maven-failsafe-and-surefire-plugins-version>2.16</maven-failsafe-and-surefire-plugins-version> + <maven-gpg-plugin-version>1.4</maven-gpg-plugin-version> + <maven-install-plugin-version>2.5</maven-install-plugin-version> + <maven-invoker-plugin-version>1.8</maven-invoker-plugin-version> + <maven-jar-plugin-version>2.4</maven-jar-plugin-version> + <maven-javadoc-plugin-version>2.9.1</maven-javadoc-plugin-version> + <maven-plugin-plugin-version>3.2</maven-plugin-plugin-version> + <maven-release-plugin-version>2.3.2</maven-release-plugin-version> + <maven-remote-resources-plugin-version>1.5</maven-remote-resources-plugin-version> + <maven-resources-plugin-version>2.6</maven-resources-plugin-version> + <maven-scm-plugin-version>1.8</maven-scm-plugin-version> + <maven-scm-publish-plugin-version>1.0-beta-2</maven-scm-publish-plugin-version> + <maven-site-plugin-version>3.3</maven-site-plugin-version> + <maven-source-plugin-version>2.2.1</maven-source-plugin-version> + <apache-rat-plugin-version>0.10</apache-rat-plugin-version> + <clirr-maven-plugin-version>2.6</clirr-maven-plugin-version> + <maven-dependency-plugin-version>2.8</maven-dependency-plugin-version> + <javacc-maven-plugin-version>2.6</javacc-maven-plugin-version> + <maven-rar-plugin-version>2.3</maven-rar-plugin-version> + <!-- javac source/target properties --> <java.source>1.6</java.source> <java.target>1.6</java.target> @@ -152,11 +180,176 @@ </repositories> <build> + <pluginManagement> + <plugins> + <!-- override the parent pom, set versions etc --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>${maven-antrun-plugin-version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>${maven-assembly-plugin-version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <version>${maven-clean-plugin-version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${maven-compiler-plugin-version}</version> + <configuration> + <source>${java.source}</source> + <target>${java.target}</target> + <optimize>true</optimize> + <showDeprecation>true</showDeprecation> + <showWarnings>true</showWarnings> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>${maven-deploy-plugin-version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-docck-plugin</artifactId> + <version>${maven-docck-plugin-version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>${maven-enforcer-plugin-version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <version>${maven-failsafe-and-surefire-plugins-version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <version>${maven-gpg-plugin-version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>${maven-install-plugin-version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-invoker-plugin</artifactId> + <version>${maven-invoker-plugin-version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>${maven-jar-plugin-version}</version> + <configuration> + <archive> + <manifest> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${maven-javadoc-plugin-version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + <version>${maven-plugin-plugin-version}</version> + </plugin> + <!-- START SNIPPET: release-plugin-configuration --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>${maven-release-plugin-version}</version> + <configuration> + <useReleaseProfile>false</useReleaseProfile> + <goals>deploy</goals> + <arguments>-Papache-release ${arguments}</arguments> + </configuration> + </plugin> + <!-- END SNIPPET: release-plugin-configuration --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-remote-resources-plugin</artifactId> + <version>${maven-remote-resources-plugin-version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>${maven-resources-plugin-version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-plugin</artifactId> + <version>${maven-scm-plugin-version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-publish-plugin</artifactId> + <version>${maven-scm-publish-plugin-version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>${maven-site-plugin-version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>${maven-source-plugin-version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-failsafe-and-surefire-plugins-version}</version> + </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <version>${apache-rat-plugin-version}</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>clirr-maven-plugin</artifactId> + <version>${clirr-maven-plugin-version}</version> + </plugin> + + <!-- the below are not in the parent pom --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>${maven-dependency-plugin-version}</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javacc-maven-plugin</artifactId> + <version>${javacc-maven-plugin-version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-rar-plugin</artifactId> + <version>${maven-rar-plugin-version}</version> + </plugin> + </plugins> + </pluginManagement> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <!--version specified in parent pom --> + <!--version specified in pluginManagement --> <executions> <execution> <id>create-qbtc-output-dir</id> @@ -176,7 +369,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <!--version specified in parent pom --> + <!--version specified in pluginManagement --> <configuration> <includes> <include>**/*Test.java</include> 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 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version specified via parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - </plugins> </build> </project> 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 @@ -236,21 +236,8 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version is specified in the parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <!--version is specified in the parent poms --> + <!--version specified in parent pluginManagement --> <configuration> <workingDirectory>${basedir}/..</workingDirectory> <!-- Skip the default test phase, bind to the @@ -274,7 +261,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <!--version is specified in the parent poms --> + <!--version specified in parent pluginManagement --> <executions> <!-- copy the systests config files into the ${qpid.home}/etc directory where the tests expect them --> @@ -322,7 +309,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <!--version is specified in the parent poms --> + <!--version specified in parent pluginManagement --> <executions> <execution> <id>extract-broker-distribution</id> @@ -346,7 +333,6 @@ </execution> </executions> </plugin> - </plugins> </build> 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 @@ -53,21 +53,8 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <!--version specified via parent poms --> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - <optimize>true</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <!--version specified via parent poms --> + <!--version specified in parent pluginManagement --> <configuration> <skip>true</skip> </configuration> |
