Use scope=provided for karaf shell

The is filtered from features, but its dependencies are not,
fix that by having shell at scope=provided.

Change-Id: If927a076ef8701ddd2fc883a55d2223cddfa71a0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/odl-genius-api/pom.xml b/features/odl-genius-api/pom.xml
index 047766728e47fef18206367cc5f378f69fd9901e..c678b84c3b7be2bc3bf0df7d7f4bf90d54c03c5f 100644 (file)
--- a/features/odl-genius-api/pom.xml
+++ b/features/odl-genius-api/pom.xml
@@ -42,12 +42,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.odlparent</groupId>
-      <artifactId>odl-apache-sshd</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>odl-mdsal-model-rfc7224</artifactId>

diff --git a/idmanager/idmanager-shell/pom.xml b/idmanager/idmanager-shell/pom.xml
index 2670216b55f3330f3d81946fdd7d39cd49340e70..e463e252be8607899195966c9eb39d45c737a492 100644 (file)
--- a/idmanager/idmanager-shell/pom.xml
+++ b/idmanager/idmanager-shell/pom.xml
@@ -33,6 +33,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.console</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>

diff --git a/interfacemanager/interfacemanager-shell/pom.xml b/interfacemanager/interfacemanager-shell/pom.xml
index e2e906777776272d73ab8ce3c36a78cc269d2ddf..d9892ba3872f95b6747aefe210869e6a3c18e2be 100644 (file)
--- a/interfacemanager/interfacemanager-shell/pom.xml
+++ b/interfacemanager/interfacemanager-shell/pom.xml
@@ -38,6 +38,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.console</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

diff --git a/itm/itm-impl/pom.xml b/itm/itm-impl/pom.xml
index 32418b2246c576278cd9233c27ea80c72b5b78a5..051912e5192a874a75539528300184be4f4cecfc 100644 (file)
--- a/itm/itm-impl/pom.xml
+++ b/itm/itm-impl/pom.xml
@@ -108,6 +108,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>
       <artifactId>org.apache.karaf.shell.console</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>