BUG-2626: activate enunciate only on jdk-1.7

[controller.git] / opendaylight / networkconfiguration / neutron / northbound / pom.xml

diff --git a/opendaylight/networkconfiguration/neutron/northbound/pom.xml b/opendaylight/networkconfiguration/neutron/northbound/pom.xml
index 8111e69c19bb0b7874387da1ecea394381f1bd5c..e61a8e5118b0c19e2cc72bc529f82fe78e954c6b 100644 (file)
--- a/opendaylight/networkconfiguration/neutron/northbound/pom.xml
+++ b/opendaylight/networkconfiguration/neutron/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>
@@ -16,37 +16,25 @@
       <artifactId>jersey-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.enunciate</groupId>
-      <artifactId>enunciate-core-annotations</artifactId>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-server</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.persistence</groupId>
-      <artifactId>org.eclipse.persistence.antlr</artifactId>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-servlet</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.persistence</groupId>
-      <artifactId>org.eclipse.persistence.core</artifactId>
+      <groupId>org.codehaus.enunciate</groupId>
+      <artifactId>enunciate-core-annotations</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.persistence</groupId>
       <artifactId>org.eclipse.persistence.moxy</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>commons.northbound</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>containermanager</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>networkconfig.neutron</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal</artifactId>
-    </dependency>
   </dependencies>
 
   <build>
@@ -57,12 +45,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Import-Package>org.opendaylight.controller.sal.utils,
-                            org.opendaylight.controller.containermanager,
-                            org.opendaylight.controller.northbound.commons,
-                            org.opendaylight.controller.northbound.commons.exception,
-                            org.opendaylight.controller.northbound.commons.utils,
-                            org.opendaylight.controller.networkconfig.neutron,
+            <Import-Package>org.opendaylight.controller.networkconfig.neutron,
                             org.eclipse.persistence.jaxb.rs,
                             com.sun.jersey.spi.container.servlet,
                             javax.ws.rs,
@@ -71,16 +54,13 @@
                             javax.xml.bind.annotation,
                             javax.xml.bind,
                             org.slf4j,
+                            org.osgi.framework,
                             !org.codehaus.enunciate.jaxrs</Import-Package>
             <Web-ContextPath>/controller/nb/v2/neutron</Web-ContextPath>
           </instructions>
           <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>