Switch to OSGi Core r7 (Felix Framework 6.0.0 and Resolver 2.0.0)
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 bcfbd98..cd14f88 100644
--- a/assemblies/features/base/pom.xml
+++ b/assemblies/features/base/pom.xml
@@ -161,7 +161,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/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
index 1426918..3243790 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
+++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
@@ -57,27 +57,27 @@
# Framework config properties.
#
org.osgi.framework.system.packages= \
- org.osgi.dto;version="1.0",\
- org.osgi.resource;version="1.0",\
- org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto",\
- org.osgi.framework;version="1.8",\
- org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto",\
- org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",\
- org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",\
- org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework",\
- org.osgi.framework.hooks.weaving;version="1.1";uses:="org.osgi.framework.wiring",\
- org.osgi.framework.launch;version="1.2";uses:="org.osgi.framework",\
- org.osgi.framework.namespace;version="1.1";uses:="org.osgi.resource",\
- org.osgi.framework.startlevel;version="1.0";uses:="org.osgi.framework",\
- org.osgi.framework.startlevel.dto;version="1.0";uses:="org.osgi.dto",\
- org.osgi.framework.wiring;version="1.2";uses:="org.osgi.framework,org.osgi.resource",\
- org.osgi.framework.wiring.dto;version="1.2";uses:="org.osgi.dto,org.osgi.resource.dto",\
+ org.osgi.framework;version="1.9", \
+ org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto", \
+ org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework", \
+ org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring", \
+ org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework", \
+ org.osgi.framework.hooks.weaving;version="1.1";uses:="org.osgi.framework.wiring", \
+ org.osgi.framework.launch;version="1.2";uses:="org.osgi.framework", \
+ org.osgi.framework.namespace;version="1.1";uses:="org.osgi.resource", \
+ org.osgi.framework.startlevel;version="1.0";uses:="org.osgi.framework", \
+ org.osgi.framework.startlevel.dto;version="1.0";uses:="org.osgi.dto", \
+ org.osgi.framework.wiring;version="1.2";uses:="org.osgi.framework,org.osgi.resource", \
+ org.osgi.framework.wiring.dto;version="1.3";uses:="org.osgi.dto,org.osgi.resource.dto", \
+ org.osgi.resource;version="1.0", \
+ org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto", \
org.osgi.service.condpermadmin;version="1.1.1";uses:="org.osgi.framework,org.osgi.service.permissionadmin",\
org.osgi.service.packageadmin;version="1.2";uses:="org.osgi.framework",org.osgi.service.permissionadmin;version="1.2",\
- org.osgi.service.resolver;version="1.0";uses:="org.osgi.resource",\
- org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework",\
- org.osgi.service.url;version="1.0",\
- org.osgi.util.tracker;version="1.5.1";uses:="org.osgi.framework",\
+ org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework", \
+ org.osgi.service.url;version="1.0", \
+ org.osgi.service.resolver;version="1.1";uses:="org.osgi.resource", \
+ org.osgi.util.tracker;version="1.5.2";uses:="org.osgi.framework", \
+ org.osgi.dto;version="1.1", \
org.apache.karaf.version;version="@@karaf.osgi.version@@",\
org.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version="@@karaf.osgi.version@@",\
org.apache.karaf.jaas.boot;uses:="javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.osgi.framework";version="@@karaf.osgi.version@@",\
diff --git a/audit/pom.xml b/audit/pom.xml
index b2f9bbf..96c5031 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 d5b6a6d..38a38b3 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 f3f7fb5..3a511bf 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 f9d4d36..ffebba3 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 2889c14..b645fe4 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/demos/command/pom.xml b/demos/command/pom.xml
index 5fb8526..2eaf164 100644
--- a/demos/command/pom.xml
+++ b/demos/command/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/demos/deployer/bundle/pom.xml b/demos/deployer/bundle/pom.xml
index 843bb96..36d6d1c 100644
--- a/demos/deployer/bundle/pom.xml
+++ b/demos/deployer/bundle/pom.xml
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/demos/web/pom.xml b/demos/web/pom.xml
index 7de42e4..09ffe62 100644
--- a/demos/web/pom.xml
+++ b/demos/web/pom.xml
@@ -43,7 +43,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/deployer/blueprint/pom.xml b/deployer/blueprint/pom.xml
index f28d4b2..2dcc596 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 b71ee42..85adf6e 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 6d9d98f..96d5c49 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 e42de9e..9d53b32 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 1ff6b62..01d50f1 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 1b61df8..a127969 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 6faa13b..5b169b6 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/event/pom.xml b/event/pom.xml
index 4fca15d..185389c 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/features/command/pom.xml b/features/command/pom.xml
index 3c7046f..08efea2 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 9b585e2..6ca91bf 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>
diff --git a/features/extension/pom.xml b/features/extension/pom.xml
index 166775c..b5f9247 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 3e1d309..1624756 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 fb8f38d..521c2a6 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 5708e6c..36e851b 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 3d6623a..9ee9e99 100644
--- a/itests/test/pom.xml
+++ b/itests/test/pom.xml
@@ -59,12 +59,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/jaas/blueprint/config/pom.xml b/jaas/blueprint/config/pom.xml
index d07f7bb..cda32be 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 dae49f5..c8acc62 100644
--- a/jaas/blueprint/jasypt/pom.xml
+++ b/jaas/blueprint/jasypt/pom.xml
@@ -68,13 +68,13 @@
<!-- Force osgi 4.2 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 481b77a..5fdc228 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 f0ed5fa..a11e158 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 0657b9f..09610fe 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 a6bc821..ee80d3f 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 5d760fc..96b1662 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 fce3b54..cff159b 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 c985a4b..b5bef5c 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 44449f5..1e06ac3 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 d3949d8..fc504cd 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 a2e1629..a344752 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 0b02cd9..3d88509 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 c79c87d..0f012dd 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 0997275..149081f 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 1c7e1fe..bae32ae 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 0c5bcd3..c098bde 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 2cc45ef..c3c2971 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 972182b..7a87a94 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 b874e10..dd2620a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,7 +192,7 @@
<felix.connect.version>0.2.0</felix.connect.version>
<felix.coordinator.version>1.0.2</felix.coordinator.version>
<felix.fileinstall.version>3.6.4</felix.fileinstall.version>
- <felix.framework.version>5.6.10</felix.framework.version>
+ <felix.framework.version>6.0.0</felix.framework.version>
<felix.framework.security.version>2.6.0</felix.framework.security.version>
<felix.gogo.runtime.version>1.1.0-SNAPSHOT</felix.gogo.runtime.version>
<felix.gogo.jline.version>1.1.0-SNAPSHOT</felix.gogo.jline.version>
@@ -210,7 +210,7 @@
<felix.scr.version>2.1.0</felix.scr.version>
<felix.scr.webconsole.plugin.version>2.0.8</felix.scr.webconsole.plugin.version>
<felix.scr.annotation.version>1.12.0</felix.scr.annotation.version>
- <felix.resolver.version>1.16.0</felix.resolver.version>
+ <felix.resolver.version>2.0.0</felix.resolver.version>
<aries.application.version>1.0.0</aries.application.version>
<aries.application.api.version>1.0.0</aries.application.api.version>
@@ -268,7 +268,7 @@
<maven-plugin-annotations.version>3.5</maven-plugin-annotations.version>
<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.version>7.0.0</osgi.version>
<osgi.compendium.version>5.0.0</osgi.compendium.version>
<pax.cdi.version>1.0.0</pax.cdi.version>
@@ -369,7 +369,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>${osgi.version}</version>
<scope>provided</scope>
</dependency>
@@ -824,7 +824,7 @@
<exclusions>
<exclusion>
<groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -835,7 +835,7 @@
<exclusions>
<exclusion>
<groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -851,7 +851,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<version>${osgi.compendium.version}</version>
</dependency>
<dependency>
@@ -884,7 +884,7 @@
</exclusion>
<exclusion>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</exclusion>
<exclusion>
<groupId>org.easymock</groupId>
@@ -899,11 +899,11 @@
<exclusions>
<exclusion>
<groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
</exclusion>
<exclusion>
<groupId>net.sf.kxml</groupId>
@@ -918,11 +918,11 @@
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</exclusion>
<exclusion>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -953,11 +953,11 @@
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</exclusion>
<exclusion>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -973,11 +973,11 @@
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</exclusion>
<exclusion>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
</exclusion>
<exclusion>
<groupId>concurrent</groupId>
@@ -994,6 +994,12 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.resolver</artifactId>
<version>${felix.resolver.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/profile/pom.xml b/profile/pom.xml
index e6dfb11..3e0f582 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 080f9fb..a27b2a3 100644
--- a/scheduler/pom.xml
+++ b/scheduler/pom.xml
@@ -94,12 +94,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 c702dae..f184e3b 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 c561016..9111d69 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 3363bde..33ad05b 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 c4e05df..ebdf1ee 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 d587d41..d44fa3f 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 e75df60..4a98d5e 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 5586f9a..877dd21 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 590ba9f..65d0d84 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 3965f24..5b87d74 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 4dc26e6..ef433a6 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 fb1d14a..0941d8a 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 499cca6..e2b64d2 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 0a84ce7..fea1564 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 670914b..d194429 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 7e80640..8cd7680 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 ff81b79..e2c9278 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 71aa940..fbdd3f0 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 77fae7a..0d40032 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 2872122..fde3e19 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>
@@ -212,7 +216,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 814680b..50fb806 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 f3845ec..5f98edc 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 33caa6a..c866da8 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 408bc89..3fc4d55 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>
diff --git a/webconsole/features/pom.xml b/webconsole/features/pom.xml
index 3a5d190..2813af2 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 b52f84e..ba139a5 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 4b64087..0be6d23 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 14e8bd9..7df7518 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 3867a48..e878aad 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>
