Use OSGi R7

Update osgi.core dependencies to point to OSGi R7 artifact instead
of R6.

Change-Id: Ia23ad2271bdfe58d60be92acf58e1a2cbe7f9a87
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit faf4269773c06c4dfc6db1fef4b4551d7eed6caa)

diff --git a/bgp/benchmark-app/pom.xml b/bgp/benchmark-app/pom.xml
index d11651bd6ed5b5908a49e79c0cd39c6f53ca4b60..12fd9ba3c9b421e98b6eb6324bad14c492e952d3 100644 (file)
--- a/bgp/benchmark-app/pom.xml
+++ b/bgp/benchmark-app/pom.xml
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

diff --git a/bgp/rib-impl/pom.xml b/bgp/rib-impl/pom.xml
index 6b646a8b70f13c3c033f78ffd39fa0e74bfca486..421ffbe85b056232e5bde0a9b2a7e5e394fab310 100644 (file)
--- a/bgp/rib-impl/pom.xml
+++ b/bgp/rib-impl/pom.xml
@@ -177,7 +177,7 @@
         <!-- OSGi, FIXME: remove this -->
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
 
         <!-- Testing dependencies -->

diff --git a/bgp/topology-provider/pom.xml b/bgp/topology-provider/pom.xml
index 795a23fff5f5a12ce92fcb1d5b7142c36538b45a..4cb35b7f7fa17c647f5ec995355ee6926ce9113d 100644 (file)
--- a/bgp/topology-provider/pom.xml
+++ b/bgp/topology-provider/pom.xml
@@ -117,7 +117,7 @@
         <!-- FIXME: remove this -->
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
 
         <!-- Test dependencies -->

diff --git a/pcep/topology/topology-provider/pom.xml b/pcep/topology/topology-provider/pom.xml
index d0524dd0956905d6c1719f3ffb17e0653bbf3140..0fc1b6db49a202503ab878227b28dd619c9c95b6 100644 (file)
--- a/pcep/topology/topology-provider/pom.xml
+++ b/pcep/topology/topology-provider/pom.xml
@@ -132,7 +132,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

diff --git a/pcep/tunnel/tunnel-provider/pom.xml b/pcep/tunnel/tunnel-provider/pom.xml
index 88650c553002c5b5e3d1a4c001594695800a5cf8..820efbf4743f83bb94c7c53316bfa310329bfcec 100644 (file)
--- a/pcep/tunnel/tunnel-provider/pom.xml
+++ b/pcep/tunnel/tunnel-provider/pom.xml
@@ -124,7 +124,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
 

diff --git a/programming/impl/pom.xml b/programming/impl/pom.xml
index 6d969a632e561f6fe8838a3caec317139a23e9a2..40def796f845b10e5624ac3a8bf4309108f469a9 100644 (file)
--- a/programming/impl/pom.xml
+++ b/programming/impl/pom.xml
@@ -71,7 +71,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.checkerframework</groupId>