You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2020/12/24 13:41:23 UTC

[ws-axiom] branch master updated: Update OSGi dependencies

This is an automated email from the ASF dual-hosted git repository.

veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git


The following commit(s) were added to refs/heads/master by this push:
     new e21193c  Update OSGi dependencies
e21193c is described below

commit e21193ce8b321b40935e3ba375b67b61b2731889
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Thu Dec 24 13:40:34 2020 +0000

    Update OSGi dependencies
---
 apidocs/pom.xml           | 4 ++--
 axiom-api/pom.xml         | 4 ++--
 pom.xml                   | 9 ++++-----
 testing/testutils/pom.xml | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/apidocs/pom.xml b/apidocs/pom.xml
index 8d81a12..ea262a9 100644
--- a/apidocs/pom.xml
+++ b/apidocs/pom.xml
@@ -50,12 +50,12 @@
              We need them to process the sources. -->
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>org.osgi.framework</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
+            <artifactId>org.osgi.util.tracker</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/axiom-api/pom.xml b/axiom-api/pom.xml
index 92cbe7a..f45ec1f 100644
--- a/axiom-api/pom.xml
+++ b/axiom-api/pom.xml
@@ -58,12 +58,12 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>org.osgi.framework</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
+            <artifactId>org.osgi.util.tracker</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 4d71033..2d4232b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -243,7 +243,6 @@
     <properties>
         <javaVersion>1.7</javaVersion>
 
-        <osgi.version>5.0.0</osgi.version>
         <failIfNoTests>false</failIfNoTests>
         <aspectj.version>1.9.6</aspectj.version>
         <shade.plugin.version>3.2.4</shade.plugin.version>
@@ -287,13 +286,13 @@
             </dependency>
             <dependency>
                 <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.core</artifactId>
-                <version>${osgi.version}</version>
+                <artifactId>org.osgi.framework</artifactId>
+                <version>1.10.0</version>
             </dependency>
             <dependency>
                 <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.compendium</artifactId>
-                <version>${osgi.version}</version>
+                <artifactId>org.osgi.util.tracker</artifactId>
+                <version>1.5.3</version>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>
diff --git a/testing/testutils/pom.xml b/testing/testutils/pom.xml
index 5ce302f..29e9968 100644
--- a/testing/testutils/pom.xml
+++ b/testing/testutils/pom.xml
@@ -49,7 +49,7 @@
         </dependency>
         <dependency><!-- We use this only for LDAP like filters -->
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>org.osgi.framework</artifactId>
         </dependency>
         <dependency>
             <groupId>jakarta.activation</groupId>