Migrate OSGi compendium references

We are using OSGi R6, make sure we are also referencing the correct
compendium artifact name.

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

diff --git a/aaa-filterchain/pom.xml b/aaa-filterchain/pom.xml
index 7f4aafcf13a45df8cc9527e09941fc75670e298f..1adf189f9f761447c8eed2396c0c38fafb45f01b 100644 (file)
--- a/aaa-filterchain/pom.xml
+++ b/aaa-filterchain/pom.xml
@@ -23,7 +23,7 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
+      <artifactId>osgi.cmpn</artifactId>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>

diff --git a/aaa-shiro/impl/pom.xml b/aaa-shiro/impl/pom.xml
index 19fae44c6274bba5ec1303f8c896fa2bea1d4f4d..e4dde047359d55d9d18773fb8540baa78d0eb5c5 100644 (file)
--- a/aaa-shiro/impl/pom.xml
+++ b/aaa-shiro/impl/pom.xml
@@ -76,7 +76,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
+            <artifactId>osgi.cmpn</artifactId>
         </dependency>
 
         <!-- JSON JAXB Stuff -->

diff --git a/docs/pom.xml b/docs/pom.xml
index 1be5614d4a4208e0ad73294de46eb7d6b3609825..4ac9e09612d4871ff7242ed571989a7868e8570f 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -138,6 +138,10 @@
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.cmpn</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.immutables</groupId>
             <artifactId>value</artifactId>

diff --git a/features/odl-aaa-web/pom.xml b/features/odl-aaa-web/pom.xml
index 544ffd4a8487ab88c0c5eb2e128aeabb0bfd5a6a..441beeaba997431a09a02c894c1a181dd1dd7d2d 100644 (file)
--- a/features/odl-aaa-web/pom.xml
+++ b/features/odl-aaa-web/pom.xml
@@ -61,11 +61,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <!-- required due to https://jira.opendaylight.org/browse/ODLPARENT-136 -->
-            <artifactId>org.osgi.compendium</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}.web</groupId>
             <artifactId>web-osgi-impl</artifactId>