You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/06/10 07:06:08 UTC
[karaf] branch karaf-4.2.x updated: [KARAF-6202] Use new OSGi
core/cmpn Maven coordinates (preparation step for OSGi R7 upgrade)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new d4c7dd2 [KARAF-6202] Use new OSGi core/cmpn Maven coordinates (preparation step for OSGi R7 upgrade)
d4c7dd2 is described below
commit d4c7dd2bc17d2f16b1dca7eaaea16eb9b9034197
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sun Jun 9 14:17:47 2019 +0200
[KARAF-6202] Use new OSGi core/cmpn Maven coordinates (preparation step for OSGi R7 upgrade)
---
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
assemblies/features/base/pom.xml | 2 +-
audit/pom.xml | 4 ++--
bundle/blueprintstate/pom.xml | 2 +-
bundle/core/pom.xml | 4 ++--
bundle/springstate/pom.xml | 2 +-
config/pom.xml | 4 ++--
deployer/blueprint/pom.xml | 2 +-
deployer/features/pom.xml | 4 ++--
deployer/kar/pom.xml | 4 ++--
deployer/spring/pom.xml | 2 +-
deployer/wrap/pom.xml | 2 +-
diagnostic/boot/pom.xml | 2 +-
diagnostic/core/pom.xml | 4 ++--
docker/pom.xml | 4 ++--
event/pom.xml | 4 ++--
.../karaf-bundle-example-client/pom.xml | 2 +-
.../karaf-bundle-example-provider/pom.xml | 2 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../karaf-jpa-example-provider-ds-openjpa/pom.xml | 2 +-
.../karaf-maven-example-deploy/pom.xml | 2 +-
.../karaf-maven-example-run-bundle/pom.xml | 2 +-
features/command/pom.xml | 4 ++--
features/core/pom.xml | 6 ++++--
.../internal/region/SubsystemResolveContext.java | 22 ++++++++++++++++++++++
features/extension/pom.xml | 2 +-
http/pom.xml | 4 ++--
instance/pom.xml | 4 ++--
itests/common/pom.xml | 4 ++--
itests/test/pom.xml | 4 ++--
.../KarafMinimalMonitoredTestSupport.java | 5 +----
...ResolverRegisteredOnlyAfterConfigAdminTest.java | 2 +-
jaas/blueprint/config/pom.xml | 2 +-
jaas/blueprint/jasypt/pom.xml | 6 +++---
jaas/boot/pom.xml | 2 +-
jaas/command/pom.xml | 2 +-
jaas/config/pom.xml | 2 +-
jaas/jasypt/pom.xml | 4 ++--
jaas/modules/pom.xml | 4 ++--
jdbc/pom.xml | 4 ++--
jms/pom.xml | 4 ++--
jndi/pom.xml | 2 +-
jpa/hibernate/pom.xml | 2 +-
kar/pom.xml | 4 ++--
log/pom.xml | 4 ++--
main/pom.xml | 2 +-
management/server/pom.xml | 4 ++--
manual/pom.xml | 4 ++--
maven/core/pom.xml | 4 ++--
obr/pom.xml | 2 +-
package/pom.xml | 2 +-
pom.xml | 6 +++---
profile/pom.xml | 4 ++--
scheduler/pom.xml | 4 ++--
scr/examples/component-factory/pom.xml | 4 ++--
scr/examples/managed-service/pom.xml | 4 ++--
scr/examples/service/pom.xml | 4 ++--
scr/management/pom.xml | 2 +-
scr/state/pom.xml | 2 +-
service/core/pom.xml | 2 +-
service/guard/pom.xml | 4 ++--
services/coordinator/pom.xml | 2 +-
services/eventadmin/pom.xml | 4 ++--
services/staticcm/pom.xml | 4 ++--
shell/commands/pom.xml | 4 ++--
shell/console/pom.xml | 4 ++--
shell/core/pom.xml | 4 ++--
shell/ssh/pom.xml | 4 ++--
specs/activator/pom.xml | 2 +-
specs/locator/pom.xml | 2 +-
subsystem/pom.xml | 4 ++--
system/pom.xml | 2 +-
tooling/karaf-maven-plugin/pom.xml | 12 +++++++++++-
tooling/karaf-services-maven-plugin/pom.xml | 2 +-
util/pom.xml | 4 ++--
web/pom.xml | 2 +-
webconsole/console/pom.xml | 6 +++---
webconsole/features/pom.xml | 4 ++--
webconsole/gogo/pom.xml | 4 ++--
webconsole/http/pom.xml | 4 ++--
webconsole/instance/pom.xml | 4 ++--
wrapper/pom.xml | 2 +-
84 files changed, 165 insertions(+), 134 deletions(-)
diff --git a/archetypes/bundle/src/main/resources/archetype-resources/pom.xml b/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
index 0a8badc..5eacc21 100644
--- a/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>${osgi.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/archetypes/command/src/main/resources/archetype-resources/pom.xml b/archetypes/command/src/main/resources/archetype-resources/pom.xml
index dd7077f..88cd379 100644
--- a/archetypes/command/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/command/src/main/resources/archetype-resources/pom.xml
@@ -37,14 +37,14 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>^osgi.version^</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<version>^osgi.compendium.version^</version>
<scope>provided</scope>
</dependency>
diff --git a/assemblies/features/base/pom.xml b/assemblies/features/base/pom.xml
index d8c281d..0ed2f36 100644
--- a/assemblies/features/base/pom.xml
+++ b/assemblies/features/base/pom.xml
@@ -212,7 +212,7 @@
</artifactItem>
<artifactItem>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<outputDirectory>target/classes/resources/lib/boot</outputDirectory>
</artifactItem>
<artifactItem>
diff --git a/audit/pom.xml b/audit/pom.xml
index 3b6bc9d..35080e5 100644
--- a/audit/pom.xml
+++ b/audit/pom.xml
@@ -41,12 +41,12 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/bundle/blueprintstate/pom.xml b/bundle/blueprintstate/pom.xml
index cb49199..f47079c 100644
--- a/bundle/blueprintstate/pom.xml
+++ b/bundle/blueprintstate/pom.xml
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/bundle/core/pom.xml b/bundle/core/pom.xml
index cb7c900..3c8f2bd 100644
--- a/bundle/core/pom.xml
+++ b/bundle/core/pom.xml
@@ -47,12 +47,12 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/bundle/springstate/pom.xml b/bundle/springstate/pom.xml
index 06524f1..e41b0e2 100644
--- a/bundle/springstate/pom.xml
+++ b/bundle/springstate/pom.xml
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/config/pom.xml b/config/pom.xml
index 74a6c21..667163c 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -41,12 +41,12 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/deployer/blueprint/pom.xml b/deployer/blueprint/pom.xml
index cc97e6a..8f24be0 100644
--- a/deployer/blueprint/pom.xml
+++ b/deployer/blueprint/pom.xml
@@ -56,7 +56,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/deployer/features/pom.xml b/deployer/features/pom.xml
index 4e7811d..e3b7c45 100644
--- a/deployer/features/pom.xml
+++ b/deployer/features/pom.xml
@@ -50,12 +50,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/deployer/kar/pom.xml b/deployer/kar/pom.xml
index c20768a..cd06a1c 100644
--- a/deployer/kar/pom.xml
+++ b/deployer/kar/pom.xml
@@ -50,12 +50,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/deployer/spring/pom.xml b/deployer/spring/pom.xml
index a77bf03..1aa36f5 100644
--- a/deployer/spring/pom.xml
+++ b/deployer/spring/pom.xml
@@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/deployer/wrap/pom.xml b/deployer/wrap/pom.xml
index 1cc5d5d..19f2454 100644
--- a/deployer/wrap/pom.xml
+++ b/deployer/wrap/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/diagnostic/boot/pom.xml b/diagnostic/boot/pom.xml
index 7b09f45..3b6ef86 100644
--- a/diagnostic/boot/pom.xml
+++ b/diagnostic/boot/pom.xml
@@ -41,7 +41,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/diagnostic/core/pom.xml b/diagnostic/core/pom.xml
index 9351c07..f3ecfcf 100644
--- a/diagnostic/core/pom.xml
+++ b/diagnostic/core/pom.xml
@@ -41,13 +41,13 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/docker/pom.xml b/docker/pom.xml
index d7eae8e..6fe8d9d 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -40,12 +40,12 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/event/pom.xml b/event/pom.xml
index 2345380..b22b852 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -54,7 +54,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml b/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml
index 0a65105..65d2d0c 100644
--- a/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml
+++ b/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
</dependencies>
diff --git a/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml b/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml
index 850731e..5f76bba 100644
--- a/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml
+++ b/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
</dependencies>
diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml
index 41404bd..6ad80a8 100644
--- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml
+++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml
@@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>6.0.0</version>
</dependency>
<dependency>
diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml
index 8edace2..468d9c5 100644
--- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml
+++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml
@@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>6.0.0</version>
</dependency>
<dependency>
diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml
index 454f433..9e612b5 100644
--- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml
+++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml
@@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>6.0.0</version>
</dependency>
<dependency>
diff --git a/examples/karaf-maven-example/karaf-maven-example-deploy/pom.xml b/examples/karaf-maven-example/karaf-maven-example-deploy/pom.xml
index b5994a7..3f1cf9d 100644
--- a/examples/karaf-maven-example/karaf-maven-example-deploy/pom.xml
+++ b/examples/karaf-maven-example/karaf-maven-example-deploy/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
</dependencies>
diff --git a/examples/karaf-maven-example/karaf-maven-example-run-bundle/pom.xml b/examples/karaf-maven-example/karaf-maven-example-run-bundle/pom.xml
index 2492cc9..fcda551 100644
--- a/examples/karaf-maven-example/karaf-maven-example-run-bundle/pom.xml
+++ b/examples/karaf-maven-example/karaf-maven-example-run-bundle/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
</dependencies>
diff --git a/features/command/pom.xml b/features/command/pom.xml
index 7cf24c4..13039f6 100644
--- a/features/command/pom.xml
+++ b/features/command/pom.xml
@@ -40,12 +40,12 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/features/core/pom.xml b/features/core/pom.xml
index 418d23b..26686d6 100644
--- a/features/core/pom.xml
+++ b/features/core/pom.xml
@@ -40,12 +40,12 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -169,6 +169,8 @@
*
</Import-Package>
<Private-Package>
+ org.osgi.util.promise,
+ org.osgi.util.function,
org.apache.karaf.features.internal.*,
org.apache.felix.utils.collections,
org.apache.felix.utils.version,
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolveContext.java b/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolveContext.java
index 645a677..f08efaa 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolveContext.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolveContext.java
@@ -45,9 +45,13 @@ import org.osgi.resource.Capability;
import org.osgi.resource.Requirement;
import org.osgi.resource.Resource;
import org.osgi.resource.Wiring;
+import org.osgi.service.repository.ExpressionCombiner;
import org.osgi.service.repository.Repository;
+import org.osgi.service.repository.RequirementBuilder;
+import org.osgi.service.repository.RequirementExpression;
import org.osgi.service.resolver.HostedCapability;
import org.osgi.service.resolver.ResolveContext;
+import org.osgi.util.promise.Promise;
import static org.apache.karaf.features.internal.resolver.ResourceUtils.addIdentityRequirement;
import static org.apache.karaf.features.internal.resolver.ResourceUtils.getUri;
@@ -350,6 +354,24 @@ public class SubsystemResolveContext extends ResolveContext {
return result;
}
+ @Override
+ public Promise<Collection<Resource>> findProviders(RequirementExpression expression) {
+ // TODO
+ return null;
+ }
+
+ @Override
+ public ExpressionCombiner getExpressionCombiner() {
+ // TODO
+ return null;
+ }
+
+ @Override
+ public RequirementBuilder newRequirementBuilder(String namespace) {
+ // TODO
+ return null;
+ }
+
private void wrap(Map<Capability, Capability> map, Subsystem subsystem, Resource resource) {
ResourceImpl wrapped = new ResourceImpl();
for (Capability cap : resource.getCapabilities(null)) {
diff --git a/features/extension/pom.xml b/features/extension/pom.xml
index 2168cae..51dc0a6 100644
--- a/features/extension/pom.xml
+++ b/features/extension/pom.xml
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/http/pom.xml b/http/pom.xml
index dfd553a..65e266b 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -41,12 +41,12 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/instance/pom.xml b/instance/pom.xml
index d3573cc..cf427c5 100644
--- a/instance/pom.xml
+++ b/instance/pom.xml
@@ -42,13 +42,13 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/itests/common/pom.xml b/itests/common/pom.xml
index 0eccfec..c2b4f1a 100644
--- a/itests/common/pom.xml
+++ b/itests/common/pom.xml
@@ -72,12 +72,12 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/itests/test/pom.xml b/itests/test/pom.xml
index bb7aa5c..9b2ccfa 100644
--- a/itests/test/pom.xml
+++ b/itests/test/pom.xml
@@ -65,12 +65,12 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java b/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java
index b81ac79..2a5cd7b 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java
@@ -23,10 +23,7 @@ import static org.apache.karaf.itests.KarafTestSupport.MIN_RMI_SERVER_PORT;
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureSecurity;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.*;
import static org.ops4j.pax.tinybundles.core.TinyBundles.bundle;
import static org.ops4j.pax.tinybundles.core.TinyBundles.withBnd;
import static org.osgi.framework.Constants.OBJECTCLASS;
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java b/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java
index ac83196..96163e8 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java
@@ -51,7 +51,7 @@ public class MavenResolverRegisteredOnlyAfterConfigAdminTest extends KarafMinima
composite(editConfigurationFilePut("etc/org.apache.karaf.features.cfg",
new File("target/test-classes/etc/org.apache.karaf.features.cfg"))),
// etc/config.properties which have org.ops4j.pax.url.mvn.requireConfigAdminConfig=true
- editConfigurationFileExtend("etc/config.properties", "etc/org.apache.karaf.features.cfg", "true")
+ editConfigurationFilePut("etc/config.properties", "org.ops4j.pax.url.mvn.requireConfigAdminConfig", "true")
};
}
diff --git a/jaas/blueprint/config/pom.xml b/jaas/blueprint/config/pom.xml
index aec2658..5b88b52 100644
--- a/jaas/blueprint/config/pom.xml
+++ b/jaas/blueprint/config/pom.xml
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/jaas/blueprint/jasypt/pom.xml b/jaas/blueprint/jasypt/pom.xml
index e8dda97..86637d1 100644
--- a/jaas/blueprint/jasypt/pom.xml
+++ b/jaas/blueprint/jasypt/pom.xml
@@ -65,16 +65,16 @@
<scope>test</scope>
</dependency>
- <!-- Force osgi 4.2 so that blueprint bundle tracker works correctly -->
+ <!-- Force osgi, so that blueprint bundle tracker works correctly -->
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>test</scope>
</dependency>
diff --git a/jaas/boot/pom.xml b/jaas/boot/pom.xml
index b92a52c..2ceb394 100644
--- a/jaas/boot/pom.xml
+++ b/jaas/boot/pom.xml
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/jaas/command/pom.xml b/jaas/command/pom.xml
index d956192..33366e6 100644
--- a/jaas/command/pom.xml
+++ b/jaas/command/pom.xml
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/jaas/config/pom.xml b/jaas/config/pom.xml
index 5b3e99a..3f1e7d7 100644
--- a/jaas/config/pom.xml
+++ b/jaas/config/pom.xml
@@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/jaas/jasypt/pom.xml b/jaas/jasypt/pom.xml
index 06306ab..a3ffeef 100644
--- a/jaas/jasypt/pom.xml
+++ b/jaas/jasypt/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>test</scope>
</dependency>
diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml
index 5d60aab..c5264bd 100644
--- a/jaas/modules/pom.xml
+++ b/jaas/modules/pom.xml
@@ -62,13 +62,13 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 3e60a76..7cb2d22 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -41,12 +41,12 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/jms/pom.xml b/jms/pom.xml
index d87a1ee..0d2dbfd 100644
--- a/jms/pom.xml
+++ b/jms/pom.xml
@@ -41,12 +41,12 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/jndi/pom.xml b/jndi/pom.xml
index ecbc084..692e0e9 100644
--- a/jndi/pom.xml
+++ b/jndi/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
diff --git a/jpa/hibernate/pom.xml b/jpa/hibernate/pom.xml
index f7d4f22..db12625 100644
--- a/jpa/hibernate/pom.xml
+++ b/jpa/hibernate/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/kar/pom.xml b/kar/pom.xml
index ae309cc..1bdedf2 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -51,12 +51,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/log/pom.xml b/log/pom.xml
index 1a562ec..06689af 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -41,12 +41,12 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/main/pom.xml b/main/pom.xml
index 8593760..fd154dc 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -41,7 +41,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/management/server/pom.xml b/management/server/pom.xml
index 37049c2..954088e 100644
--- a/management/server/pom.xml
+++ b/management/server/pom.xml
@@ -41,12 +41,12 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/manual/pom.xml b/manual/pom.xml
index ae87fba..0b6133e 100644
--- a/manual/pom.xml
+++ b/manual/pom.xml
@@ -185,12 +185,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<version>${osgi.compendium.version}</version>
</dependency>
<dependency>
diff --git a/maven/core/pom.xml b/maven/core/pom.xml
index 140cc95..624481f 100644
--- a/maven/core/pom.xml
+++ b/maven/core/pom.xml
@@ -37,11 +37,11 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/obr/pom.xml b/obr/pom.xml
index 3a30ccf..26858ef 100644
--- a/obr/pom.xml
+++ b/obr/pom.xml
@@ -41,7 +41,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/package/pom.xml b/package/pom.xml
index b2b8d95..e9f501c 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 6fa04f9..032a06f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -279,7 +279,7 @@
<org.osgi.service.jdbc.version>1.0.0</org.osgi.service.jdbc.version>
<org.osgi.service.jpa.version>1.0.0</org.osgi.service.jpa.version>
<osgi.version>6.0.0</osgi.version>
- <osgi.compendium.version>5.0.0</osgi.compendium.version>
+ <osgi.compendium.version>6.0.0</osgi.compendium.version>
<pax.cdi.version>1.1.1</pax.cdi.version>
<pax.exam.version>4.13.1</pax.exam.version>
@@ -381,7 +381,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>${osgi.version}</version>
<scope>provided</scope>
</dependency>
@@ -847,7 +847,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<version>${osgi.compendium.version}</version>
</dependency>
<dependency>
diff --git a/profile/pom.xml b/profile/pom.xml
index 8a86d26..a3ca68d 100644
--- a/profile/pom.xml
+++ b/profile/pom.xml
@@ -42,13 +42,13 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/scheduler/pom.xml b/scheduler/pom.xml
index b8eb185..c68457a 100644
--- a/scheduler/pom.xml
+++ b/scheduler/pom.xml
@@ -96,12 +96,12 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/scr/examples/component-factory/pom.xml b/scr/examples/component-factory/pom.xml
index d705634..c2fff68 100644
--- a/scr/examples/component-factory/pom.xml
+++ b/scr/examples/component-factory/pom.xml
@@ -37,11 +37,11 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/scr/examples/managed-service/pom.xml b/scr/examples/managed-service/pom.xml
index 61741f5..1c6fb80 100644
--- a/scr/examples/managed-service/pom.xml
+++ b/scr/examples/managed-service/pom.xml
@@ -37,11 +37,11 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/scr/examples/service/pom.xml b/scr/examples/service/pom.xml
index 251e4ee..f48d839 100644
--- a/scr/examples/service/pom.xml
+++ b/scr/examples/service/pom.xml
@@ -37,11 +37,11 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/scr/management/pom.xml b/scr/management/pom.xml
index f20c3ed..cd95800 100644
--- a/scr/management/pom.xml
+++ b/scr/management/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/scr/state/pom.xml b/scr/state/pom.xml
index 8855264..ba3a787 100644
--- a/scr/state/pom.xml
+++ b/scr/state/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/service/core/pom.xml b/service/core/pom.xml
index 0065004..bf31a6d 100644
--- a/service/core/pom.xml
+++ b/service/core/pom.xml
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/service/guard/pom.xml b/service/guard/pom.xml
index f35523e..8c6d4af 100644
--- a/service/guard/pom.xml
+++ b/service/guard/pom.xml
@@ -55,12 +55,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/services/coordinator/pom.xml b/services/coordinator/pom.xml
index 97908e7..bac34c2 100644
--- a/services/coordinator/pom.xml
+++ b/services/coordinator/pom.xml
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/services/eventadmin/pom.xml b/services/eventadmin/pom.xml
index e4e6f1b..0b8b531 100644
--- a/services/eventadmin/pom.xml
+++ b/services/eventadmin/pom.xml
@@ -95,7 +95,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -105,7 +105,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/services/staticcm/pom.xml b/services/staticcm/pom.xml
index ae3bd46..d88412b 100644
--- a/services/staticcm/pom.xml
+++ b/services/staticcm/pom.xml
@@ -74,12 +74,12 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/shell/commands/pom.xml b/shell/commands/pom.xml
index 1f06a91..0d4be52 100644
--- a/shell/commands/pom.xml
+++ b/shell/commands/pom.xml
@@ -53,12 +53,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/shell/console/pom.xml b/shell/console/pom.xml
index 322f463..9ab98f4 100644
--- a/shell/console/pom.xml
+++ b/shell/console/pom.xml
@@ -53,12 +53,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/shell/core/pom.xml b/shell/core/pom.xml
index 5e7add2..7b5360f 100644
--- a/shell/core/pom.xml
+++ b/shell/core/pom.xml
@@ -49,12 +49,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml
index 53dfe14..d950688 100644
--- a/shell/ssh/pom.xml
+++ b/shell/ssh/pom.xml
@@ -53,13 +53,13 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/specs/activator/pom.xml b/specs/activator/pom.xml
index 06f3a8f..2df3d92 100644
--- a/specs/activator/pom.xml
+++ b/specs/activator/pom.xml
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/specs/locator/pom.xml b/specs/locator/pom.xml
index 90819bf..f19103e 100644
--- a/specs/locator/pom.xml
+++ b/specs/locator/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/subsystem/pom.xml b/subsystem/pom.xml
index 9f0cb74..4bcd950 100644
--- a/subsystem/pom.xml
+++ b/subsystem/pom.xml
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/system/pom.xml b/system/pom.xml
index 6bf2b08..5f1f046 100644
--- a/system/pom.xml
+++ b/system/pom.xml
@@ -43,7 +43,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml
index 8583b71..17c7f31 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -131,6 +131,10 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -159,6 +163,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.resolver</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
@@ -212,7 +222,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/tooling/karaf-services-maven-plugin/pom.xml b/tooling/karaf-services-maven-plugin/pom.xml
index a75d091..86a678e 100644
--- a/tooling/karaf-services-maven-plugin/pom.xml
+++ b/tooling/karaf-services-maven-plugin/pom.xml
@@ -95,7 +95,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>compile</scope>
</dependency>
diff --git a/util/pom.xml b/util/pom.xml
index 585e46b..4089823 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -36,12 +36,12 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/web/pom.xml b/web/pom.xml
index a693124..bbda0de 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -43,7 +43,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/webconsole/console/pom.xml b/webconsole/console/pom.xml
index 96bd91c..01c1a35 100644
--- a/webconsole/console/pom.xml
+++ b/webconsole/console/pom.xml
@@ -44,11 +44,11 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
@@ -165,7 +165,7 @@
org.apache.felix.framework;inline=org/apache/felix/framework/util/VersionRange**,
<!-- ServiceTracker -->
- org.osgi.compendium;inline=org/osgi/util/tracker/*,
+ osgi.cmpn;inline=org/osgi/util/tracker/*,
<!-- File Upload -->
commons-fileupload,
diff --git a/webconsole/features/pom.xml b/webconsole/features/pom.xml
index 1f27c70..0f2effe 100644
--- a/webconsole/features/pom.xml
+++ b/webconsole/features/pom.xml
@@ -40,12 +40,12 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/webconsole/gogo/pom.xml b/webconsole/gogo/pom.xml
index 4d3d6fe..f326ad3 100644
--- a/webconsole/gogo/pom.xml
+++ b/webconsole/gogo/pom.xml
@@ -40,12 +40,12 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/webconsole/http/pom.xml b/webconsole/http/pom.xml
index e113537..4fb9e92 100644
--- a/webconsole/http/pom.xml
+++ b/webconsole/http/pom.xml
@@ -40,12 +40,12 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/webconsole/instance/pom.xml b/webconsole/instance/pom.xml
index 3658420..051b8a4 100644
--- a/webconsole/instance/pom.xml
+++ b/webconsole/instance/pom.xml
@@ -45,12 +45,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/wrapper/pom.xml b/wrapper/pom.xml
index 22a2735..8634913 100644
--- a/wrapper/pom.xml
+++ b/wrapper/pom.xml
@@ -44,7 +44,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>