From: Alissa Bonas <abonas@redhat.com>
Date: Tue, 29 Oct 2013 16:15:37 +0000 (+0200)
Subject: Use same maven-compiler-plugin version 2.5.1 in all poms.
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~543
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=80fa93b16fe26d6f0d5ea71ff4f387a48b09b5fa

Use same maven-compiler-plugin version 2.5.1 in all poms.
Also declare it in commons pom in pluginsManagement section.
Bump java version to 1.7 in release pom for maven-compiler-plugin

Change-Id: I8844a65029edf99db9eb97db594ef960fff68ba4
Signed-off-by: Alissa Bonas <abonas@redhat.com>
---

diff --git a/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
index 114393c186..00dacf7f65 100644
--- a/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
@@ -36,7 +36,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0</version>
+        <version>2.5.1</version>
         <inherited>true</inherited>
         <configuration>
           <source>1.7</source>
diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 774ecd284f..0221552686 100644
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -96,6 +96,9 @@
     <sonar.language>java</sonar.language>
     <forwardingrulesmanager.version>0.5.0-SNAPSHOT</forwardingrulesmanager.version>
     <statisticsmanager.version>0.5.0-SNAPSHOT</statisticsmanager.version>
+    <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
+    <java.version.source>1.7</java.version.source>
+    <java.version.target>1.7</java.version.target>
   </properties>
 
   <dependencyManagement>
@@ -1250,6 +1253,17 @@
             <javadocDir>target/apidocs</javadocDir>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${maven.compile.plugin.version}</version>
+          <configuration>
+            <source>${java.version.source}</source>
+            <target>${java.version.target}</target>
+            <testSource>${java.version.source}</testSource>
+            <testTarget>${java.version.target}</testTarget>
+          </configuration>
+       </plugin>
       </plugins>
     </pluginManagement>
   </build>
diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml
index 657a57a13c..5c1e2daf1f 100755
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@ -213,13 +213,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.5.1</version>
-                <configuration>
-                    <source>${java.version.source}</source>
-                    <target>${java.version.target}</target>
-                    <testSource>${java.version.source}</testSource>
-                    <testTarget>${java.version.target}</testTarget>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
diff --git a/opendaylight/netconf/pom.xml b/opendaylight/netconf/pom.xml
index 8436a1388b..7f0bd44078 100644
--- a/opendaylight/netconf/pom.xml
+++ b/opendaylight/netconf/pom.xml
@@ -33,8 +33,6 @@
         <osgi.version>5.0.0</osgi.version>
         <maven.bundle.version>2.3.7</maven.bundle.version>
         <slf4j.version>1.7.2</slf4j.version>
-        <java.version.source>1.7</java.version.source>
-        <java.version.target>1.7</java.version.target>
         <netconf.netty.version>4.0.10.Final</netconf.netty.version>
     </properties>
 
@@ -181,13 +179,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.5.1</version>
-                <configuration>
-                    <source>${java.version.source}</source>
-                    <target>${java.version.target}</target>
-                    <testSource>${java.version.source}</testSource>
-                    <testTarget>${java.version.target}</testTarget>
-                </configuration>
             </plugin>
         </plugins>
         <pluginManagement>
diff --git a/third-party/openflowj/pom.xml b/third-party/openflowj/pom.xml
index cc8b28d0f2..8d8724dceb 100644
--- a/third-party/openflowj/pom.xml
+++ b/third-party/openflowj/pom.xml
@@ -121,10 +121,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
+        <version>2.5.1</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.7</source>
+          <target>1.7</target>
         </configuration>
       </plugin>
     </plugins>