From b5df352e50340e8bc93da11c347dc2140d12388f Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 4 Aug 2020 09:36:34 +0200
Subject: [PATCH] Remove unneeded osgi-core dependencies

A number of artifacts depend on osgi-core for no reason at all,
while this does not hurt, it does slow the build down a bit. Remove
these dependencies.

Change-Id: Ic1b386caf570454568a66a06331b6976f50be3a6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 aclservice/impl/pom.xml         | 5 -----
 aclservice/shell/pom.xml        | 1 -
 cloud-servicechain/impl/pom.xml | 5 -----
 dhcpservice/shell/pom.xml       | 1 -
 fibmanager/shell/pom.xml        | 1 -
 neutronvpn/shell/pom.xml        | 1 -
 qosservice/impl/pom.xml         | 1 -
 vpnmanager/shell/pom.xml        | 1 -
 8 files changed, 16 deletions(-)

diff --git a/aclservice/impl/pom.xml b/aclservice/impl/pom.xml
index c3983d51c3..bdec68d500 100644
--- a/aclservice/impl/pom.xml
+++ b/aclservice/impl/pom.xml
@@ -21,11 +21,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <modelVersion>4.0.0</modelVersion>
 
     <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>aclservice-api</artifactId>
diff --git a/aclservice/shell/pom.xml b/aclservice/shell/pom.xml
index 18831c0f24..e1b51402d6 100644
--- a/aclservice/shell/pom.xml
+++ b/aclservice/shell/pom.xml
@@ -25,7 +25,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/cloud-servicechain/impl/pom.xml b/cloud-servicechain/impl/pom.xml
index 911e8b2afc..de0e4f7011 100644
--- a/cloud-servicechain/impl/pom.xml
+++ b/cloud-servicechain/impl/pom.xml
@@ -19,11 +19,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
diff --git a/dhcpservice/shell/pom.xml b/dhcpservice/shell/pom.xml
index 59d7e90230..871aa7b536 100644
--- a/dhcpservice/shell/pom.xml
+++ b/dhcpservice/shell/pom.xml
@@ -25,7 +25,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
diff --git a/fibmanager/shell/pom.xml b/fibmanager/shell/pom.xml
index f69d64f98f..24181e8e9f 100644
--- a/fibmanager/shell/pom.xml
+++ b/fibmanager/shell/pom.xml
@@ -25,7 +25,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
diff --git a/neutronvpn/shell/pom.xml b/neutronvpn/shell/pom.xml
index 6cc810d7d6..0d3d7fab84 100644
--- a/neutronvpn/shell/pom.xml
+++ b/neutronvpn/shell/pom.xml
@@ -25,7 +25,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
diff --git a/qosservice/impl/pom.xml b/qosservice/impl/pom.xml
index 76345aca96..a54f019c4b 100644
--- a/qosservice/impl/pom.xml
+++ b/qosservice/impl/pom.xml
@@ -25,7 +25,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
diff --git a/vpnmanager/shell/pom.xml b/vpnmanager/shell/pom.xml
index d31e2336c1..1b0b708595 100644
--- a/vpnmanager/shell/pom.xml
+++ b/vpnmanager/shell/pom.xml
@@ -25,7 +25,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
-- 
2.36.6