Use org.osgi:org.osgi.core instead of org.eclipse.tycho's osgi (Equinox)

see https://git.opendaylight.org/gerrit/#/c/51520/

I'll like to block use of dependency tycho ASAP.

Change-Id: Iacb6b5efe337eed156a44dc32528445eda99fd06
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/mappingservice/config/pom.xml b/mappingservice/config/pom.xml
index c3efd5efbbcc1a54556aaacc9a6ebb8998523165..4b4f273f350ef5feb12d6b47b58ac885bb9456e9 100644 (file)
--- a/mappingservice/config/pom.xml
+++ b/mappingservice/config/pom.xml
@@ -14,8 +14,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.eclipse.tycho</groupId>
-      <artifactId>org.eclipse.osgi</artifactId>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
@@ -39,5 +39,5 @@
       <url>${nexus.site.url}/${project.artifactId}/</url>
     </site>
   </distributionManagement>
-  
+
 </project>

diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml
index 95600bc6bc702fe19423de0071882ac3269354e1..9d47ded4c08bbd7f7159d98cad1e53c83c454d4c 100644 (file)
--- a/mappingservice/implementation/pom.xml
+++ b/mappingservice/implementation/pom.xml
@@ -57,10 +57,6 @@
       <scope>test</scope>
     </dependency>
     <!-- needed for osgi console -->
-    <dependency>
-      <groupId>org.eclipse.tycho</groupId>
-      <artifactId>org.eclipse.osgi</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-singleton-common-api</artifactId>

diff --git a/mappingservice/shell/pom.xml b/mappingservice/shell/pom.xml
index f58adce5abe8957d0190b04ed5f9cb3fe3c75bf4..f0476cb585383e1fb19b2d1e2bae098c69ffa3c2 100644 (file)
--- a/mappingservice/shell/pom.xml
+++ b/mappingservice/shell/pom.xml
@@ -14,8 +14,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.eclipse.tycho</groupId>
-      <artifactId>org.eclipse.osgi</artifactId>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>