Merge "Remove duplicate dependency declaration"

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

diff --git a/opendaylight/networkconfiguration/neutron/pom.xml b/opendaylight/networkconfiguration/neutron/pom.xml
index 998dd4488cdef15ddd68dab6c9ef86ad4a856790..a9ead6786038331850533be4d1ff05546859b3e4 100644 (file)
--- a/opendaylight/networkconfiguration/neutron/pom.xml
+++ b/opendaylight/networkconfiguration/neutron/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.2-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <artifactId>networkconfig.neutron</artifactId>
-  <version>0.4.2-SNAPSHOT</version>
+  <version>0.5.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <properties>
     <enunciate.version>1.26.2</enunciate.version>
@@ -19,16 +19,12 @@
       <artifactId>commons-net</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>clustering.services</artifactId>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>configuration</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
     </dependency>
   </dependencies>
   <build>
@@ -39,15 +35,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Import-Package>org.opendaylight.controller.configuration,
-              org.opendaylight.controller.clustering.services,
-              org.opendaylight.controller.sal.core,
-              org.opendaylight.controller.sal.utils,
-              org.apache.felix.dm,
-              org.apache.commons.net.util,
-              org.osgi.service.component,
-              org.slf4j,
-              javax.xml.bind.annotation</Import-Package>
+            <Import-Package>*</Import-Package>
           </instructions>
           <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
         </configuration>