Migrate osgi.core reference

OSGi core artifact was renamed for Release 7, update references to
eliminate dependency on OSGi R6.

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

diff --git a/docs/pom.xml b/docs/pom.xml
index e6417653ce826571659271823e4090617dad37f3..d07b43416d5773e7e8c5c9594b0e661b59500b4e 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -114,7 +114,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>

         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml
index 9fcb16e5f4126f136f161a4d3408548905b65c69..923d79d643cb4da5536754e01e6886e520414a41 100644 (file)
--- a/opendaylight/blueprint/pom.xml
+++ b/opendaylight/blueprint/pom.xml
@@ -80,7 +80,7 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>

-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>

     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>

diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml
index dc3dbe8ccefaebb8ce576856efba3a9fa73afd37..6a5374b5155d53710c5236670af35e2fd27b63ad 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-base/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-base/pom.xml
@@ -104,7 +104,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
     <dependency>
         <groupId>org.osgi</groupId>
     </dependency>
     <dependency>
         <groupId>org.osgi</groupId>

-        <artifactId>org.osgi.core</artifactId>
+        <artifactId>osgi.core</artifactId>

         <scope>compile</scope>
     </dependency>
     <dependency>
         <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml
index 6d7b89f868f2f1d4ffd5bd4e296a2eaeae212338..0d509bd6a0a4a333c8ffa54d6a094161a82f271e 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-parent/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml
@@ -91,7 +91,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
     <dependency>
         <groupId>org.osgi</groupId>
     </dependency>
     <dependency>
         <groupId>org.osgi</groupId>

-        <artifactId>org.osgi.core</artifactId>
+        <artifactId>osgi.core</artifactId>

     </dependency>
     <dependency>
         <groupId>junit</groupId>
     </dependency>
     <dependency>
         <groupId>junit</groupId>

diff --git a/opendaylight/md-sal/sal-akka-raft/pom.xml b/opendaylight/md-sal/sal-akka-raft/pom.xml
index 10309bf620a9483c431a6f99393ad76fe6c429f6..2726e8ca20e6eea86be8776fbf65b70f78d3f192 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/pom.xml
+++ b/opendaylight/md-sal/sal-akka-raft/pom.xml
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>

-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>

     </dependency>
 
     <!-- Test Dependencies -->
     </dependency>
 
     <!-- Test Dependencies -->

diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
index 0c59747b776caedddffcec0528f11679d82b1afb..02a6b276c7f1ca246cf77ac30c6c5e47eef6642f 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
@@ -21,7 +21,7 @@
 
     <dependency>
       <groupId>org.osgi</groupId>
 
     <dependency>
       <groupId>org.osgi</groupId>

-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>

     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>

diff --git a/opendaylight/md-sal/samples/toaster-consumer/pom.xml b/opendaylight/md-sal/samples/toaster-consumer/pom.xml
index 8a4279e632ea6394a0f6d25e32f849eeefce6f99..c0fa205b0ca1574648c5ba1c67ab771f303ef570 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-consumer/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-consumer/pom.xml
@@ -27,7 +27,7 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>

-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>

     </dependency>
   </dependencies>
 
     </dependency>
   </dependencies>
 

diff --git a/opendaylight/md-sal/samples/toaster-provider/pom.xml b/opendaylight/md-sal/samples/toaster-provider/pom.xml
index f2fc861fcfdfdd88a0a2c7ed1ee97892a50b66b9..af0fc2981d3600e09e1ddb3d5ecf286a67e5e860 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-provider/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-provider/pom.xml
@@ -27,7 +27,7 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>

-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>

     </dependency>
 
     <!-- dependencies to use AbstractDataBrokerTest -->
     </dependency>
 
     <!-- dependencies to use AbstractDataBrokerTest -->