BUG-2626: activate enunciate only on jdk-1.7

The plugin is not supported with JDK8. Create two parent pom.xmls, one
of which defines the activation on JDK7 only and the second one
centralizes the AD-SAL definitions for it.

Change-Id: I791847d6e27dae0f51499b303cbea9163f5f184a
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/northbound/pom.xml b/northbound/pom.xml
index 0eecca0c3e6bec6dc7b49a7a043a2411093bf049..e61a8e5118b0c19e2cc72bc529f82fe78e954c6b 100644 (file)
--- a/northbound/pom.xml
+++ b/northbound/pom.xml
@@ -3,9 +3,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.controller</groupId>
-    <artifactId>commons.opendaylight</artifactId>
+    <artifactId>enunciate-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../../commons/opendaylight</relativePath>
+    <relativePath>../../../commons/enunciate-parent</relativePath>
   </parent>
   <artifactId>networkconfig.neutron.northbound</artifactId>
   <version>0.5.0-SNAPSHOT</version>
@@ -61,10 +61,6 @@
           <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.enunciate</groupId>
-        <artifactId>maven-enunciate-plugin</artifactId>
-      </plugin>
     </plugins>
   </build>
   <scm>