From f77c49561dd22fc71516a5174201a8a138c7918c Mon Sep 17 00:00:00 2001
From: Michael Vorburger <vorburger@redhat.com>
Date: Thu, 19 Apr 2018 20:52:29 +0200
Subject: [PATCH] remove org.osgi.core dependencies which are now no longer
 required - yay!

Change-Id: I4f2ad5e86f622537554b3df308dc02557c83a09e
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
---
 .../production/odl-neutron-hostconfig-ovs/pom.xml    | 12 ------------
 .../production/odl-neutron-hostconfig-vpp/pom.xml    |  8 --------
 features/production/odl-neutron-logger/pom.xml       | 12 ------------
 features/production/odl-neutron-spi/pom.xml          |  8 --------
 integration/test-standalone/pom.xml                  |  7 -------
 neutron-hostconfig/ovs/pom.xml                       |  4 ----
 neutron-hostconfig/utils/pom.xml                     |  4 ----
 neutron-hostconfig/vpp/pom.xml                       |  4 ----
 neutron-logger/pom.xml                               |  4 ----
 neutron-spi/pom.xml                                  |  4 ----
 northbound-api/pom.xml                               |  6 ------
 transcriber/pom.xml                                  |  4 ----
 12 files changed, 77 deletions(-)

diff --git a/features/production/odl-neutron-hostconfig-ovs/pom.xml b/features/production/odl-neutron-hostconfig-ovs/pom.xml
index a90b5eaf6..1b515e7d5 100644
--- a/features/production/odl-neutron-hostconfig-ovs/pom.xml
+++ b/features/production/odl-neutron-hostconfig-ovs/pom.xml
@@ -94,18 +94,6 @@
             <artifactId>neutron-hostconfig-ovs</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/features/production/odl-neutron-hostconfig-vpp/pom.xml b/features/production/odl-neutron-hostconfig-vpp/pom.xml
index 0ac9fef9c..f048f1cb8 100644
--- a/features/production/odl-neutron-hostconfig-vpp/pom.xml
+++ b/features/production/odl-neutron-hostconfig-vpp/pom.xml
@@ -99,14 +99,6 @@
             <type>cfg</type>
             <classifier>config</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/features/production/odl-neutron-logger/pom.xml b/features/production/odl-neutron-logger/pom.xml
index 23ffaa722..9af5a6b4c 100644
--- a/features/production/odl-neutron-logger/pom.xml
+++ b/features/production/odl-neutron-logger/pom.xml
@@ -55,18 +55,6 @@
             <artifactId>neutron-logger</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/features/production/odl-neutron-spi/pom.xml b/features/production/odl-neutron-spi/pom.xml
index 39f57a909..0c61a5237 100644
--- a/features/production/odl-neutron-spi/pom.xml
+++ b/features/production/odl-neutron-spi/pom.xml
@@ -54,14 +54,6 @@
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
diff --git a/integration/test-standalone/pom.xml b/integration/test-standalone/pom.xml
index 12e547cea..3724848c6 100644
--- a/integration/test-standalone/pom.xml
+++ b/integration/test-standalone/pom.xml
@@ -80,12 +80,5 @@
       <version>0.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
-
-    <!-- TODO This is temporary, remove this again, soon -->
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/neutron-hostconfig/ovs/pom.xml b/neutron-hostconfig/ovs/pom.xml
index 68717ad1b..71787bfbf 100644
--- a/neutron-hostconfig/ovs/pom.xml
+++ b/neutron-hostconfig/ovs/pom.xml
@@ -50,10 +50,6 @@
       <artifactId>neutron-hostconfig-utils</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
diff --git a/neutron-hostconfig/utils/pom.xml b/neutron-hostconfig/utils/pom.xml
index 33c35b771..afbd349cc 100644
--- a/neutron-hostconfig/utils/pom.xml
+++ b/neutron-hostconfig/utils/pom.xml
@@ -33,10 +33,6 @@
       <artifactId>model</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
diff --git a/neutron-hostconfig/vpp/pom.xml b/neutron-hostconfig/vpp/pom.xml
index 5ab57534f..1ec13e1bf 100644
--- a/neutron-hostconfig/vpp/pom.xml
+++ b/neutron-hostconfig/vpp/pom.xml
@@ -51,10 +51,6 @@
       <artifactId>neutron-hostconfig-utils</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
diff --git a/neutron-logger/pom.xml b/neutron-logger/pom.xml
index ce9741119..3f8398b92 100644
--- a/neutron-logger/pom.xml
+++ b/neutron-logger/pom.xml
@@ -33,10 +33,6 @@
       <artifactId>model</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
diff --git a/neutron-spi/pom.xml b/neutron-spi/pom.xml
index 0a301505c..1fca14418 100644
--- a/neutron-spi/pom.xml
+++ b/neutron-spi/pom.xml
@@ -45,10 +45,6 @@
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
diff --git a/northbound-api/pom.xml b/northbound-api/pom.xml
index cd6939383..23987788d 100644
--- a/northbound-api/pom.xml
+++ b/northbound-api/pom.xml
@@ -54,12 +54,6 @@
       <artifactId>neutron-spi</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <!-- TODO Remove this when AbstractNeutronNorthbound does not need
-           to use bundleContext.getServiceReferences() anymore... -->
-      <artifactId>org.osgi.core</artifactId>
-    </dependency>
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
diff --git a/transcriber/pom.xml b/transcriber/pom.xml
index 004b994fb..d956641dd 100644
--- a/transcriber/pom.xml
+++ b/transcriber/pom.xml
@@ -71,10 +71,6 @@
       <artifactId>model</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-    </dependency>
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
-- 
2.36.6