From: Stephen Kitt <skitt@redhat.com>
Date: Thu, 8 Oct 2015 14:12:56 +0000 (+0200)
Subject: Prepare for Karaf 3.0.4 upgrade
X-Git-Tag: release/beryllium~238
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=c09dc45ec6f475fbb5398d6fec2182738e73483f;ds=sidebyside

Prepare for Karaf 3.0.4 upgrade

Pull in karaf.version from odlparent.
Drop import of org.apache.felix.service.command (apparently unused).

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

diff --git a/features/akka/pom.xml b/features/akka/pom.xml
index ea99e9ca3b..84e743f349 100644
--- a/features/akka/pom.xml
+++ b/features/akka/pom.xml
@@ -22,7 +22,6 @@
             DependencyManagement section of your parent pom -->
       <branding.version>1.2.0-SNAPSHOT</branding.version>
       <karaf.resources.version>1.6.0-SNAPSHOT</karaf.resources.version>
-      <karaf.version>3.0.3</karaf.version>
       <feature.test.version>0.8.0-SNAPSHOT</feature.test.version>
       <karaf.empty.version>1.6.0-SNAPSHOT</karaf.empty.version>
       <surefire.version>2.16</surefire.version>
diff --git a/opendaylight/md-sal/sal-karaf-xsql/pom.xml b/opendaylight/md-sal/sal-karaf-xsql/pom.xml
index c1d4df0c6b..bb8e541a92 100644
--- a/opendaylight/md-sal/sal-karaf-xsql/pom.xml
+++ b/opendaylight/md-sal/sal-karaf-xsql/pom.xml
@@ -91,7 +91,6 @@
                             org.apache.aries.blueprint,
                             org.osgi.service.blueprint.container,
                             org.osgi.service.blueprint.reflect,
-                            org.apache.felix.service.command,
                             org.apache.karaf.shell.commands,
                             org.apache.karaf.shell.console,
                             *</Import-Package>