Drop Karaf shell specifiers

[netvirt.git] / vpnservice / elanmanager / elanmanager-impl / pom.xml

diff --git a/vpnservice/elanmanager/elanmanager-impl/pom.xml b/vpnservice/elanmanager/elanmanager-impl/pom.xml
index 4ce75b5211f162c15ade6111d710fa4bf52f8d02..00799536e114176fdd4beedfa981d3896385e990 100644 (file)
--- a/vpnservice/elanmanager/elanmanager-impl/pom.xml
+++ b/vpnservice/elanmanager/elanmanager-impl/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.opendaylight.netvirt</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <relativePath>../../commons/binding-parent</relativePath>
   </parent>
 
@@ -34,6 +34,16 @@
       <artifactId>interfacemanager-api</artifactId>
       <version>${genius.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.infrautils</groupId>
+      <artifactId>diagstatus-api</artifactId>
+      <version>${infrautils.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.cdi</groupId>
+      <artifactId>pax-cdi-api</artifactId>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>itm-api</artifactId>
@@ -103,6 +113,12 @@
       <type>test-jar</type>
     </dependency>
     <dependency>
+        <groupId>org.opendaylight.genius</groupId>
+        <artifactId>mdsalutil-impl</artifactId>
+        <version>${genius.version}</version>
+        <scope>test</scope>
+    </dependency>
+      <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-broker-impl</artifactId>
       <scope>test</scope>
@@ -161,6 +177,21 @@
       <version>${genius.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>openflowplugin-extension-nicira</artifactId>
+      <version>${openflowplugin.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.model</groupId>
+      <artifactId>model-flow-service</artifactId>
+      <version>${openflowplugin.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.model</groupId>
+      <artifactId>model-flow-base</artifactId>
+      <version>${openflowplugin.version}</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -172,12 +203,10 @@
         <configuration>
           <instructions>
             <Embed-Transitive>true</Embed-Transitive>
-            <!-- This bundle works with Karaf 3 and 4.0 -->
-            <Import-Package>
-              org.apache.karaf.shell.commands;version="[3.0.0,4.1)",
-              org.apache.karaf.shell.console;version="[3.0.0,4.1)",
-              *
-            </Import-Package>
+            <!-- We purposely don't export any packages to avoid any dependencies
+                 on this bundle and prevent @Singleton annotated classes from being
+                 accidently included in another bundle's blueprint XML  -->
+            <Export-Package />
           </instructions>
         </configuration>
       </plugin>
@@ -207,18 +236,11 @@
         <groupId>org.eclipse.xtend</groupId>
         <artifactId>xtend-maven-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.apache.aries.blueprint</groupId>
+        <artifactId>blueprint-maven-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 
-  <!-- Maven Site Configuration The following configuration is necessary
-    for maven-site-plugin to correctly identify the correct deployment path for
-    OpenDaylight Maven sites. -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
-
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/${project.artifactId}/</url>
-    </site>
-  </distributionManagement>
 </project>