Fix checkstyle impl/common and impl/configuration

[openflowplugin.git] / drop-test-karaf / pom.xml

diff --git a/drop-test-karaf/pom.xml b/drop-test-karaf/pom.xml
index 2aab1e2c387bb857db4a77cb48d1c08f47280497..03c22843a978f2930b82a3c5e8708db30f190e34 100644 (file)
--- a/drop-test-karaf/pom.xml
+++ b/drop-test-karaf/pom.xml
@@ -4,8 +4,8 @@
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <version>0.6.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
     <artifactId>drop-test-karaf</artifactId>
     <packaging>bundle</packaging>
@@ -17,7 +17,6 @@
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>test-common</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -28,11 +27,19 @@
             <artifactId>sal-binding-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-broker-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-service</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-base</artifactId>
         </dependency>
         <dependency>
@@ -42,11 +49,6 @@
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.console</artifactId>
-            <version>${karaf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
@@ -60,18 +62,14 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>${maven.bundle.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-Activator>org.opendaylight.openflowplugin.droptestkaraf.DropTestActivator</Bundle-Activator>
-                        <Embed-Dependency>commons-lang</Embed-Dependency>
-                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                        <!-- This bundle works with Karaf 3 and 4.0 -->
                         <Import-Package>
-                          org.apache.felix.service.command,
-                          org.apache.felix.gogo.commands,
-                          org.apache.karaf.shell.console,
-                          *
+                            org.apache.karaf.shell.commands;version="[3.0.0,4.1)",
+                            org.apache.karaf.shell.console.*;version="[3.0.0,4.1)",
+                            *
                         </Import-Package>
                     </instructions>
                 </configuration>