Move the java 1.7 config to the parent pom into pluginManagement so it is enforced...

Merge failed due to conflicts and hence manually applying Hugo's changes on his behalf.

Change-Id: Ia704984f29c5f6a3371d27ad78001f904c54bb3a
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index bdee4b7b82d4de4580785d576e23e9943076e5cf..581296c8add9086e4b435f8903c694d2dc42c5f7 100755 (executable)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -21,7 +21,27 @@
   <properties>
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <java.version.source>1.7</java.version.source>
+    <java.version.target>1.7</java.version.target>
   </properties>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <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>
+
   <!-- modules should go once the jenkins job is updated to use the root pom -->
   <modules>
     <module>../../ovsdb/</module>

diff --git a/ovsdb/pom.xml b/ovsdb/pom.xml
index 7c2775fd7e279b6992c03d9fd1ea1d875b9f40fb..388a5867c90a241c59cb6195b6a6334b54ab3775 100755 (executable)
--- a/ovsdb/pom.xml
+++ b/ovsdb/pom.xml
@@ -18,8 +18,6 @@
     <packaging>bundle</packaging>
 
     <properties>
-        <java.version.source>1.7</java.version.source>
-        <java.version.target>1.7</java.version.target>
         <skip.integrationtest>true</skip.integrationtest>
         <!-- used for filtering the integration test resource -->
         <ovsdbserver.ipaddress>192.168.56.10</ovsdbserver.ipaddress>
@@ -96,16 +94,6 @@
                 <skipITs>${skip.integrationtest}</skipITs>
                </configuration>
              </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${java.version.source}</source>
-                    <target>${java.version.target}</target>
-                    <testSource>${java.version.source}</testSource>
-                    <testTarget>${java.version.target}</testTarget>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
     <dependencies>