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 b8dc605bcdd9d5b09b108c8754294dc6e8ce7f49..00799536e114176fdd4beedfa981d3896385e990 100644 (file)
--- a/vpnservice/elanmanager/elanmanager-impl/pom.xml
+++ b/vpnservice/elanmanager/elanmanager-impl/pom.xml
@@ -203,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>
@@ -239,24 +237,10 @@
         <artifactId>xtend-maven-plugin</artifactId>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <configuration>
-          <failOnError>true</failOnError>
-        </configuration>
+        <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>