Drop Karaf shell specifiers

We no longer need to support Karaf 3, and the karaf.shell
"[3.0.0,4.1)" declarations prevent us from upgrading to Karaf 4.1
(which is coming with odlparent 3).

Change-Id: I4367b34229246064319ee9e34199623666911f6a
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/drop-test-karaf/pom.xml b/drop-test-karaf/pom.xml
index fa61e501adbd3893a0ba42b88b3a86e4d9197abc..f8bf587c7da75e9a0b8c631447059ee4416d1ba4 100644 (file)
--- a/drop-test-karaf/pom.xml
+++ b/drop-test-karaf/pom.xml
@@ -59,16 +59,6 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <!-- 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>
-                    </instructions>
-                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/openflowplugin-impl/pom.xml b/openflowplugin-impl/pom.xml
index 2406609a05916188438bcb157b9f4b557d4133ee..25f57c735167c5b073887c847e8905949c6da707 100644 (file)
--- a/openflowplugin-impl/pom.xml
+++ b/openflowplugin-impl/pom.xml
@@ -123,16 +123,6 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <!-- 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>
-                    </instructions>
-                </configuration>
             </plugin>
         </plugins>
     </build>