remove org.osgi.core dependencies which are now no longer required - yay!

Change-Id: I4f2ad5e86f622537554b3df308dc02557c83a09e
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/features/production/odl-neutron-hostconfig-ovs/pom.xml b/features/production/odl-neutron-hostconfig-ovs/pom.xml
index a90b5eaf6b221734198e43cb349c2847a282eced..1b515e7d5eed91c1fec5c6d2401bb98f20fd39a3 100644 (file)
--- 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 0ac9fef9c14ad69143ca2b3db77aa3406cc6ddae..f048f1cb89d2cf9bc4caa23b339c95caaccde682 100644 (file)
--- 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 23ffaa72276e79f08b2976cce200c1764eb295e5..9af5a6b4c74397e19fccd81a8e8e3aa92165b1a3 100644 (file)
--- 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 39f57a9090b7de54bff7b47002421190026f728e..0c61a523744961fde503313e2b8639d3dd9c029e 100644 (file)
--- 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 12e547cea3afde9def89049a0f257e6f7e4f70d9..3724848c6428313f1d8b2fc83ec778ca1a2642c1 100644 (file)
--- 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 68717ad1b0b23b6d3ba7a67507ddfa99ccd0e2a5..71787bfbf10fb7d08830a9bf3e919ee656453fde 100644 (file)
--- 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 33c35b771564693a517390b812fb27c06d3038db..afbd349ccb2599aa395b5960bd7ef88b334ea3e5 100644 (file)
--- 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 5ab57534fdcf6cb8a1af7b64cf45a40efa92cd34..1ec13e1bf357668ebb2ede025bcff04a727e2f24 100644 (file)
--- 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 ce9741119e550d280de88ece4720b381595b9e69..3f8398b924e6e5722ea8a28bf9071592276eedc0 100644 (file)
--- 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 0a301505c2fede2122b46f810c7e3a011eef8072..1fca14418a25fff6e9e34c5f4d10c60e34d5a053 100644 (file)
--- 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 cd693938387943ab2ea833a094c6ca5bdfcb1e99..23987788db84ddcbb4eb9a8acd4ceedae3853ba1 100644 (file)
--- 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 004b994fb1a4bb2f185b67e9e4f2bf1a79c037d3..d956641dd3a2754d3df8dcb359cd788e6317f8bc 100644 (file)
--- 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>