This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 3332e74 [CXF-8202] Update to OSGi Core 6.0.0 (#633)
3332e74 is described below
commit 3332e7438116940c7d7db3467c02e072ecdff826
Author: Alexey Markevich <[email protected]>
AuthorDate: Thu Mar 5 15:47:21 2020 +0300
[CXF-8202] Update to OSGi Core 6.0.0 (#633)
* [CXF-8202] Update to OSGi Core 6.0.0
* switch to osgi.cmpn
---
core/pom.xml | 2 +-
distribution/javadoc/pom.xml | 2 +-
osgi/itests-felix/pom.xml | 4 ++--
.../src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java | 6 +++---
osgi/karaf/commands/pom.xml | 2 +-
parent/pom.xml | 4 ++--
rt/features/logging/pom.xml | 2 +-
rt/transports/http-hc/pom.xml | 2 +-
rt/transports/http-jetty/pom.xml | 2 +-
rt/transports/http-netty/netty-server/pom.xml | 2 +-
rt/transports/http-undertow/pom.xml | 2 +-
rt/transports/http/pom.xml | 2 +-
rt/transports/websocket/pom.xml | 2 +-
services/xkms/xkms-service/pom.xml | 2 +-
services/xkms/xkms-x509-handlers/pom.xml | 2 +-
15 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 82da697..329b079 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -185,7 +185,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 19bdc8a..6036717 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -68,7 +68,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
</dependency>
<dependency>
<groupId>com.hazelcast</groupId>
diff --git a/osgi/itests-felix/pom.xml b/osgi/itests-felix/pom.xml
index f5f2caf..9b06534 100644
--- a/osgi/itests-felix/pom.xml
+++ b/osgi/itests-felix/pom.xml
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
- <version>5.6.2</version>
+ <version>2.6.2</version>
<scope>test</scope>
</dependency>
@@ -120,7 +120,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
diff --git
a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
index 12ea5ea..f3fec4f 100644
---
a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
+++
b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
@@ -22,13 +22,13 @@ package org.apache.cxf.osgi.itests;
import javax.inject.Inject;
-import org.junit.Assert;
-import org.ops4j.pax.exam.CoreOptions;
-import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
+import org.junit.Assert;
+import org.ops4j.pax.exam.CoreOptions;
+import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
/**
*
*/
diff --git a/osgi/karaf/commands/pom.xml b/osgi/karaf/commands/pom.xml
index 6d675f3..e71f364 100644
--- a/osgi/karaf/commands/pom.xml
+++ b/osgi/karaf/commands/pom.xml
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
</dependency>
</dependencies>
<build>
diff --git a/parent/pom.xml b/parent/pom.xml
index 111c984..2980dbf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -248,7 +248,7 @@
<cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
<cxf.oro.bundle.version>2.0.8_6</cxf.oro.bundle.version>
<cxf.osgi.saaj.version>[1.4,2)</cxf.osgi.saaj.version>
- <cxf.osgi.version>5.0.0</cxf.osgi.version>
+ <cxf.osgi.version>6.0.0</cxf.osgi.version>
<cxf.pax.exam.version>4.13.1</cxf.pax.exam.version>
<cxf.reflections.bundle.version>0.9.11_2</cxf.reflections.bundle.version>
<cxf.rhino.bundle.version>1.7R2_3</cxf.rhino.bundle.version>
@@ -1315,7 +1315,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<version>${cxf.osgi.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/rt/features/logging/pom.xml b/rt/features/logging/pom.xml
index 72c1bb5..b8396a0 100644
--- a/rt/features/logging/pom.xml
+++ b/rt/features/logging/pom.xml
@@ -25,7 +25,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/rt/transports/http-hc/pom.xml b/rt/transports/http-hc/pom.xml
index 60f22a7..0a7d933 100644
--- a/rt/transports/http-hc/pom.xml
+++ b/rt/transports/http-hc/pom.xml
@@ -57,7 +57,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
<optional />
</dependency>
diff --git a/rt/transports/http-jetty/pom.xml b/rt/transports/http-jetty/pom.xml
index e0c9194..2ecdec2 100644
--- a/rt/transports/http-jetty/pom.xml
+++ b/rt/transports/http-jetty/pom.xml
@@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/rt/transports/http-netty/netty-server/pom.xml
b/rt/transports/http-netty/netty-server/pom.xml
index 99f3867..21a4d14 100644
--- a/rt/transports/http-netty/netty-server/pom.xml
+++ b/rt/transports/http-netty/netty-server/pom.xml
@@ -85,7 +85,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/rt/transports/http-undertow/pom.xml
b/rt/transports/http-undertow/pom.xml
index 8259641..f3ad371 100644
--- a/rt/transports/http-undertow/pom.xml
+++ b/rt/transports/http-undertow/pom.xml
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml
index 7af6f48..1f0f23e 100644
--- a/rt/transports/http/pom.xml
+++ b/rt/transports/http/pom.xml
@@ -75,7 +75,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
diff --git a/rt/transports/websocket/pom.xml b/rt/transports/websocket/pom.xml
index deaeebf..0e7c184 100644
--- a/rt/transports/websocket/pom.xml
+++ b/rt/transports/websocket/pom.xml
@@ -65,7 +65,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/services/xkms/xkms-service/pom.xml
b/services/xkms/xkms-service/pom.xml
index d6cac40..fc9a2cf 100644
--- a/services/xkms/xkms-service/pom.xml
+++ b/services/xkms/xkms-service/pom.xml
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/services/xkms/xkms-x509-handlers/pom.xml
b/services/xkms/xkms-x509-handlers/pom.xml
index f442720..cdaf4f6 100644
--- a/services/xkms/xkms-x509-handlers/pom.xml
+++ b/services/xkms/xkms-x509-handlers/pom.xml
@@ -58,7 +58,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
