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/jca/pom.xml     | 14 --------------
 qpid/java/jca/rar/pom.xml | 15 +--------------
 2 files changed, 1 insertion(+), 28 deletions(-)

(limited to 'qpid/java/jca')

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
@@ -52,23 +52,10 @@
    
   <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>
-
       <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>
-- 
cgit v1.2.1