Remove declarations of osgi.{annotation,cmpn,core}

These uber-bundles are deprecated and are going to go away with OSGi
R8. Remove them to force downstreams to prepare for OSGi R8 adoption.

JIRA: ODLPARENT-277
Change-Id: Ied0d3642a68aaf42ade0bd313ca96a31e8835bde
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/docs/pom.xml b/docs/pom.xml
index 83c7401dba2c98f6e24f03e7be1799e493c1fa2e..681bd7107071697d8d8bcbf3449ab0124f48bdfd 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -56,16 +56,6 @@
         </dependency>
 
         <!-- Also add dependencies we are using -->
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.annotation</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>

diff --git a/karaf-plugin/pom.xml b/karaf-plugin/pom.xml
index 88846c9c086b695ec8ec44c775db907139a7f7b2..b873154b7bb8ce51b7d115d735b26b10ae3197c2 100644 (file)
--- a/karaf-plugin/pom.xml
+++ b/karaf-plugin/pom.xml
@@ -45,9 +45,9 @@
       <version>3.5.4</version>
     </dependency>
     <dependency>
-        <groupId>org.ops4j.pax.url</groupId>
-        <artifactId>pax-url-aether</artifactId>
-        <scope>compile</scope>
+      <groupId>org.ops4j.pax.url</groupId>
+      <artifactId>pax-url-aether</artifactId>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.karaf.features</groupId>
@@ -59,16 +59,16 @@
       <artifactId>aether-api</artifactId>
       <version>1.1.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.url</artifactId>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>karaf-util</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>osgi.core</artifactId>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/karaf-plugin/src/main/java/org/opendaylight/odlparent/PopulateLocalRepoMojo.java b/karaf-plugin/src/main/java/org/opendaylight/odlparent/PopulateLocalRepoMojo.java
index 24dfdac7c38d89050a78d1aa9b1d44a0c3625b71..8d254e1936ebd1cd8fa56fad4e62c54e4fc5eff3 100644 (file)
--- a/karaf-plugin/src/main/java/org/opendaylight/odlparent/PopulateLocalRepoMojo.java
+++ b/karaf-plugin/src/main/java/org/opendaylight/odlparent/PopulateLocalRepoMojo.java
@@ -64,7 +64,7 @@ public class PopulateLocalRepoMojo extends AbstractMojo {
         try {
             URL.setURLStreamHandlerFactory(new CustomBundleUrlStreamHandlerFactory());
         } catch (Error e) {
-            LOG.warn("populate-local-repo: URL factory is already defined");
+            LOG.warn("populate-local-repo: URL factory is already defined", e);
         }
     }
 

diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index 491d8dac47407511dae0ae0f3c9aeb78303f1c83..b7b5b0eabb96b63b0a5e323be142a8bbe6bc6393 100644 (file)
--- a/odlparent-dependency-check/pom.xml
+++ b/odlparent-dependency-check/pom.xml
@@ -595,18 +595,6 @@
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.util.xml</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.annotation</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.skyscreamer</groupId>
             <artifactId>jsonassert</artifactId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 89267cb50a85641534e65883f329d463727d6b4c..4b05f692c2a3346d6cebed14f1d2eb05aa5b2fd3 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -497,14 +497,7 @@
         The definitions here are sourced from https://github.com/osgi/osgi/blob/r7-cmpn-spec-final/cnf/central.mvn
         and the corresponding layout.bnd files.
       -->
-
-      <!-- This legacy is defined in https://github.com/osgi/osgi/blob/r7-cmpn-spec-final/osgi.core/layout.bnd -->
-      <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>osgi.core</artifactId>
-        <version>7.0.0</version>
-        <scope>provided</scope>
-      </dependency>
+      <!-- osgi.core content, defined in https://github.com/osgi/osgi/blob/r7-cmpn-spec-final/osgi.core/layout.bnd -->
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.dto</artifactId>
@@ -566,13 +559,7 @@
         <scope>provided</scope>
       </dependency>
 
-      <!-- This legacy is defined in https://github.com/osgi/osgi/blob/r7-cmpn-spec-final/osgi.annotation/layout.bnd -->
-      <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>osgi.annotation</artifactId>
-        <version>7.0.0</version>
-        <scope>provided</scope>
-      </dependency>
+      <!-- osgi.annotation content, defined in https://github.com/osgi/osgi/blob/r7-cmpn-spec-final/osgi.annotation/layout.bnd -->
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.annotation.versioning</artifactId>
@@ -586,13 +573,7 @@
         <scope>provided</scope>
       </dependency>
 
-      <!-- This legacy is defined in https://github.com/osgi/osgi/blob/r7-cmpn-spec-final/osgi.cmpn/layout.bnd -->
-      <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>osgi.cmpn</artifactId>
-        <version>7.0.0</version>
-        <scope>provided</scope>
-      </dependency>
+      <!-- osg.cmpn content, defined in https://github.com/osgi/osgi/blob/r7-cmpn-spec-final/osgi.cmpn/layout.bnd -->
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.application</artifactId>