From 499269cd18d32d685b9ec5c9acacbbcf1b47d4f6 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
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/bdbstore/jmx/pom.xml      | 14 --------------
 qpid/java/bdbstore/pom.xml          | 14 --------------
 qpid/java/bdbstore/systests/pom.xml | 21 +++------------------
 3 files changed, 3 insertions(+), 46 deletions(-)

(limited to 'qpid/java/bdbstore')

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
@@ -94,23 +94,10 @@
     <testSourceDirectory>src/main/java</testSourceDirectory>
 
     <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>
 
-- 
cgit v1.2.1