From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 1 Jun 2021 11:23:08 +0000 (+0200)
Subject: Use osgi.core from OSGi R7
X-Git-Tag: release/phosphorus~10
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F98%2F96398%2F1;p=openflowplugin.git

Use osgi.core from OSGi R7

Release 7 has changed the artifact name, use the new name instead
of the R6 name.

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

diff --git a/applications/reconciliation-framework/pom.xml b/applications/reconciliation-framework/pom.xml
index 2b4a651673..d76e29b401 100644
--- a/applications/reconciliation-framework/pom.xml
+++ b/applications/reconciliation-framework/pom.xml
@@ -15,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
diff --git a/applications/southbound-cli/pom.xml b/applications/southbound-cli/pom.xml
index d2dde2f346..65525843a1 100644
--- a/applications/southbound-cli/pom.xml
+++ b/applications/southbound-cli/pom.xml
@@ -15,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
diff --git a/drop-test-karaf/pom.xml b/drop-test-karaf/pom.xml
index f2df1becb2..4f47bf503c 100644
--- a/drop-test-karaf/pom.xml
+++ b/drop-test-karaf/pom.xml
@@ -16,7 +16,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
diff --git a/openflowplugin-api/pom.xml b/openflowplugin-api/pom.xml
index a63f747225..20fcdf6906 100644
--- a/openflowplugin-api/pom.xml
+++ b/openflowplugin-api/pom.xml
@@ -20,7 +20,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}.model</groupId>
diff --git a/openflowplugin-impl/pom.xml b/openflowplugin-impl/pom.xml
index 5724bb78ec..a6a89dc09e 100644
--- a/openflowplugin-impl/pom.xml
+++ b/openflowplugin-impl/pom.xml
@@ -19,7 +19,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
diff --git a/samples/sample-bundles/pom.xml b/samples/sample-bundles/pom.xml
index 99e1b526be..8499316a8a 100644
--- a/samples/sample-bundles/pom.xml
+++ b/samples/sample-bundles/pom.xml
@@ -60,7 +60,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>