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 2021/09/23 16:38:20 UTC
[karaf] branch main updated: Upgrade to 4.4.0-SNAPSHOT with OSGi R8
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 43afbd8 Upgrade to 4.4.0-SNAPSHOT with OSGi R8
43afbd8 is described below
commit 43afbd87c64e1a7bea85569cf29df171625bdfdb
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Mon Sep 13 17:50:52 2021 +0200
Upgrade to 4.4.0-SNAPSHOT with OSGi R8
---
archetypes/assembly/pom.xml | 2 +-
archetypes/blueprint/pom.xml | 2 +-
archetypes/bundle/pom.xml | 2 +-
archetypes/command/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 7 --
archetypes/feature/pom.xml | 2 +-
archetypes/kar/pom.xml | 2 +-
archetypes/pom.xml | 2 +-
assemblies/apache-karaf-minimal/pom.xml | 2 +-
assemblies/apache-karaf/pom.xml | 2 +-
assemblies/features/base/pom.xml | 2 +-
.../resources/etc/config.properties | 4 +-
assemblies/features/enterprise/pom.xml | 2 +-
assemblies/features/framework/pom.xml | 2 +-
assemblies/features/pom.xml | 2 +-
assemblies/features/specs/pom.xml | 2 +-
assemblies/features/spring-legacy/pom.xml | 2 +-
assemblies/features/spring/pom.xml | 2 +-
assemblies/features/standard/pom.xml | 2 +-
assemblies/features/static/pom.xml | 2 +-
assemblies/pom.xml | 2 +-
audit/pom.xml | 6 +-
bom/pom.xml | 79 +++++++++++++++++++---
bundle/blueprintstate/pom.xml | 2 +-
bundle/core/pom.xml | 5 +-
bundle/pom.xml | 2 +-
bundle/springstate/pom.xml | 2 +-
client/pom.xml | 2 +-
config/pom.xml | 17 ++++-
deployer/blueprint/pom.xml | 2 +-
deployer/features/pom.xml | 7 +-
deployer/kar/pom.xml | 7 +-
deployer/pom.xml | 2 +-
deployer/spring/pom.xml | 2 +-
deployer/wrap/pom.xml | 2 +-
diagnostic/boot/pom.xml | 2 +-
diagnostic/core/pom.xml | 5 +-
diagnostic/pom.xml | 2 +-
docker/pom.xml | 7 +-
event/pom.xml | 7 +-
.../karaf-blueprint-example-client/pom.xml | 2 +-
.../karaf-blueprint-example-common/pom.xml | 2 +-
.../karaf-blueprint-example-features/pom.xml | 2 +-
.../karaf-blueprint-example-provider/pom.xml | 2 +-
examples/karaf-blueprint-example/pom.xml | 2 +-
examples/karaf-branding-example/pom.xml | 2 +-
.../karaf-bundle-example-client/pom.xml | 2 +-
.../karaf-bundle-example-common/pom.xml | 2 +-
.../karaf-bundle-example-features/pom.xml | 2 +-
.../karaf-bundle-example-provider/pom.xml | 2 +-
examples/karaf-bundle-example/pom.xml | 2 +-
.../karaf-camel-example-blueprint/pom.xml | 2 +-
.../karaf-camel-example-features/pom.xml | 2 +-
.../karaf-camel-example-java/pom.xml | 11 ++-
examples/karaf-camel-example/pom.xml | 2 +-
.../karaf-cdi-example-api/pom.xml | 2 +-
.../karaf-cdi-example-consumer/pom.xml | 2 +-
.../karaf-cdi-example-features/pom.xml | 2 +-
.../karaf-cdi-example-provider/pom.xml | 2 +-
examples/karaf-cdi-example/pom.xml | 2 +-
.../karaf-command-example-api/pom.xml | 2 +-
.../karaf-command-example-command/pom.xml | 2 +-
.../karaf-command-example-features/pom.xml | 2 +-
.../karaf-command-example-provider/pom.xml | 2 +-
examples/karaf-command-example/pom.xml | 2 +-
.../karaf-config-example-blueprint/pom.xml | 2 +-
.../karaf-config-example-features/pom.xml | 2 +-
.../karaf-config-example-listener/pom.xml | 13 ++--
.../karaf-config-example-managed-factory/pom.xml | 13 ++--
.../karaf-config-example-managed/pom.xml | 10 +--
.../karaf-config-example-scr/pom.xml | 13 +++-
.../karaf-config-example-static/pom.xml | 13 ++--
examples/karaf-config-example/pom.xml | 2 +-
examples/karaf-deployer-example/pom.xml | 7 +-
.../karaf-docker-example-app/pom.xml | 13 ++--
.../karaf-docker-example-dynamic-dist/pom.xml | 2 +-
.../karaf-docker-example-static-dist/pom.xml | 2 +-
examples/karaf-docker-example/pom.xml | 2 +-
examples/karaf-dump-example/pom.xml | 11 +--
.../karaf-http-resource-example-features/pom.xml | 2 +-
.../karaf-http-resource-example-whiteboard/pom.xml | 7 +-
examples/karaf-http-resource-example/pom.xml | 2 +-
examples/karaf-itest-example/pom.xml | 2 +-
.../karaf-jaas-example-app/pom.xml | 9 ++-
.../karaf-jaas-example-features/pom.xml | 2 +-
.../karaf-jaas-example-wab/pom.xml | 2 +-
.../karaf-jaas-example-war/pom.xml | 2 +-
examples/karaf-jaas-example/pom.xml | 2 +-
.../karaf-jdbc-example-api/pom.xml | 2 +-
.../karaf-jdbc-example-command/pom.xml | 2 +-
.../karaf-jdbc-example-features/pom.xml | 2 +-
.../karaf-jdbc-example-provider/pom.xml | 13 ++--
examples/karaf-jdbc-example/pom.xml | 2 +-
.../karaf-jms-example-command/pom.xml | 2 +-
.../karaf-jms-example-features/pom.xml | 2 +-
examples/karaf-jms-example/pom.xml | 2 +-
.../karaf-jpa-example-command/pom.xml | 2 +-
.../karaf-jpa-example-features/pom.xml | 2 +-
.../karaf-jpa-example-provider-api/pom.xml | 2 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../karaf-jpa-example-provider-blueprint/pom.xml | 2 +-
.../pom.xml | 8 +--
.../pom.xml | 8 +--
.../karaf-jpa-example-provider-ds-openjpa/pom.xml | 8 +--
.../karaf-jpa-example-provider-ds/pom.xml | 2 +-
.../karaf-jpa-example-provider/pom.xml | 2 +-
examples/karaf-jpa-example/pom.xml | 2 +-
.../karaf-log-appender-example-core/pom.xml | 7 +-
.../karaf-log-appender-example-features/pom.xml | 2 +-
examples/karaf-log-appender-example/pom.xml | 2 +-
.../karaf-maven-example-run-bundle/pom.xml | 2 +-
.../karaf-maven-example-run/pom.xml | 2 +-
examples/karaf-maven-example/pom.xml | 2 +-
.../karaf-mbean-example-api/pom.xml | 2 +-
.../karaf-mbean-example-blueprint/pom.xml | 2 +-
.../karaf-mbean-example-features/pom.xml | 2 +-
.../karaf-mbean-example-provider/pom.xml | 2 +-
.../karaf-mbean-example-scr/pom.xml | 7 +-
.../karaf-mbean-example-simple/pom.xml | 2 +-
examples/karaf-mbean-example/pom.xml | 2 +-
.../karaf-redis-example-api/pom.xml | 2 +-
.../karaf-redis-example-command/pom.xml | 2 +-
.../karaf-redis-example-features/pom.xml | 2 +-
.../karaf-redis-example-service/pom.xml | 6 +-
examples/karaf-redis-example/pom.xml | 2 +-
.../karaf-rest-example-api/pom.xml | 2 +-
.../karaf-rest-example-blueprint/pom.xml | 2 +-
.../karaf-rest-example-client-cxf/pom.xml | 2 +-
.../karaf-rest-example-client-http/pom.xml | 2 +-
.../karaf-rest-example-client-jersey/pom.xml | 2 +-
.../karaf-rest-example-client/pom.xml | 2 +-
.../karaf-rest-example-features/pom.xml | 2 +-
.../karaf-rest-example-scr/pom.xml | 6 +-
.../karaf-rest-example-whiteboard/pom.xml | 7 +-
examples/karaf-rest-example/pom.xml | 2 +-
.../karaf-scheduler-example-features/pom.xml | 2 +-
.../karaf-scheduler-example-runnable/pom.xml | 7 +-
examples/karaf-scheduler-example/pom.xml | 2 +-
.../karaf-scr-example-api/pom.xml | 2 +-
.../karaf-scr-example-client/pom.xml | 7 +-
.../karaf-scr-example-features/pom.xml | 2 +-
.../karaf-scr-example-provider/pom.xml | 7 +-
examples/karaf-scr-example/pom.xml | 2 +-
.../karaf-servlet-example-annotation/pom.xml | 2 +-
.../karaf-servlet-example-blueprint/pom.xml | 2 +-
.../karaf-servlet-example-features/pom.xml | 2 +-
.../karaf-servlet-example-registration/pom.xml | 13 ++--
.../karaf-servlet-example-scr/pom.xml | 13 ++--
.../karaf-servlet-example-upload/pom.xml | 19 ++++--
examples/karaf-servlet-example/pom.xml | 2 +-
.../karaf-soap-example-api/pom.xml | 2 +-
.../karaf-soap-example-blueprint/pom.xml | 2 +-
.../karaf-soap-example-client/pom.xml | 2 +-
.../karaf-soap-example-features/pom.xml | 2 +-
.../karaf-soap-example-scr/pom.xml | 6 +-
examples/karaf-soap-example/pom.xml | 2 +-
.../pom.xml | 10 +--
.../pom.xml | 2 +-
.../karaf-url-namespace-handler-example/pom.xml | 2 +-
.../karaf-war-example-features/pom.xml | 2 +-
.../karaf-war-example-webapp/pom.xml | 2 +-
examples/karaf-war-example/pom.xml | 2 +-
examples/karaf-websocket-example/pom.xml | 15 ++--
examples/pom.xml | 2 +-
features/command/pom.xml | 7 +-
features/core/pom.xml | 28 +++++++-
.../internal/region/SubsystemResolver.java | 1 -
features/extension/pom.xml | 2 +-
features/pom.xml | 2 +-
http/pom.xml | 10 ++-
instance/pom.xml | 8 +--
.../karaf/instance/resources/etc/config.properties | 4 +-
itests/common/pom.xml | 7 +-
itests/pom.xml | 2 +-
itests/test/pom.xml | 7 +-
jaas/blueprint/config/pom.xml | 2 +-
jaas/blueprint/jasypt/pom.xml | 8 +--
jaas/blueprint/pom.xml | 2 +-
jaas/boot/pom.xml | 2 +-
jaas/command/pom.xml | 2 +-
jaas/config/pom.xml | 2 +-
jaas/jasypt/pom.xml | 8 +--
jaas/modules/pom.xml | 11 ++-
jaas/pom.xml | 2 +-
jaas/spring-security-crypto/pom.xml | 8 +--
jdbc/pom.xml | 9 ++-
jms/pom.xml | 4 +-
jndi/pom.xml | 2 +-
kar/pom.xml | 19 +++---
log/pom.xml | 8 +--
main/pom.xml | 2 +-
management/pom.xml | 2 +-
management/server/pom.xml | 10 ++-
manual/pom.xml | 6 +-
maven/core/pom.xml | 6 +-
maven/pom.xml | 2 +-
obr/pom.xml | 2 +-
package/pom.xml | 2 +-
pom.xml | 20 ++++--
profile/pom.xml | 5 +-
scheduler/pom.xml | 4 +-
scr/management/pom.xml | 4 +-
scr/pom.xml | 2 +-
scr/state/pom.xml | 2 +-
service/core/pom.xml | 2 +-
service/guard/pom.xml | 4 +-
service/pom.xml | 2 +-
services/coordinator/pom.xml | 2 +-
services/eventadmin/pom.xml | 13 ++--
services/interceptor/api/pom.xml | 2 +-
services/interceptor/impl/pom.xml | 2 +-
services/interceptor/pom.xml | 2 +-
services/pom.xml | 2 +-
services/staticcm/pom.xml | 2 +-
shell/commands/pom.xml | 7 +-
shell/console/pom.xml | 23 ++++---
shell/core/pom.xml | 9 ++-
shell/pom.xml | 2 +-
shell/ssh/pom.xml | 5 +-
shell/table/pom.xml | 2 +-
specs/activator/pom.xml | 2 +-
specs/java.xml.ws/pom.xml | 2 +-
specs/java.xml/pom.xml | 2 +-
specs/locator/pom.xml | 2 +-
specs/pom.xml | 2 +-
subsystem/pom.xml | 8 +--
system/pom.xml | 2 +-
tooling/karaf-maven-plugin/pom.xml | 2 +-
tooling/karaf-services-maven-plugin/pom.xml | 2 +-
tooling/pom.xml | 2 +-
tooling/utils/pom.xml | 2 +-
util/pom.xml | 4 +-
web/pom.xml | 2 +-
webconsole/console/pom.xml | 13 ++--
webconsole/features/pom.xml | 7 +-
webconsole/gogo/pom.xml | 7 +-
webconsole/http/pom.xml | 7 +-
webconsole/instance/pom.xml | 7 +-
webconsole/pom.xml | 2 +-
wrapper/pom.xml | 2 +-
242 files changed, 589 insertions(+), 497 deletions(-)
diff --git a/archetypes/assembly/pom.xml b/archetypes/assembly/pom.xml
index f82181a..b3db61c 100644
--- a/archetypes/assembly/pom.xml
+++ b/archetypes/assembly/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>archetypes</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.karaf.archetypes</groupId>
diff --git a/archetypes/blueprint/pom.xml b/archetypes/blueprint/pom.xml
index 3ce5214..3316c8f 100644
--- a/archetypes/blueprint/pom.xml
+++ b/archetypes/blueprint/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>archetypes</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/archetypes/bundle/pom.xml b/archetypes/bundle/pom.xml
index f4c45d2..57dae8b 100644
--- a/archetypes/bundle/pom.xml
+++ b/archetypes/bundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>archetypes</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/archetypes/command/pom.xml b/archetypes/command/pom.xml
index a3221e0..6c5d72c 100644
--- a/archetypes/command/pom.xml
+++ b/archetypes/command/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>archetypes</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/archetypes/command/src/main/resources/archetype-resources/pom.xml b/archetypes/command/src/main/resources/archetype-resources/pom.xml
index 9547ce8..52aa1cb 100644
--- a/archetypes/command/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/command/src/main/resources/archetype-resources/pom.xml
@@ -43,13 +43,6 @@
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>^osgi.compendium.version^</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>^junit.version^</version>
diff --git a/archetypes/feature/pom.xml b/archetypes/feature/pom.xml
index 47e0c74..3001c3c 100644
--- a/archetypes/feature/pom.xml
+++ b/archetypes/feature/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>archetypes</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/archetypes/kar/pom.xml b/archetypes/kar/pom.xml
index 5e356da..931c4b2 100644
--- a/archetypes/kar/pom.xml
+++ b/archetypes/kar/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>archetypes</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 0656cb2..c460c82 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/assemblies/apache-karaf-minimal/pom.xml b/assemblies/apache-karaf-minimal/pom.xml
index 478342d..bcbe6fb 100644
--- a/assemblies/apache-karaf-minimal/pom.xml
+++ b/assemblies/apache-karaf-minimal/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.assemblies</groupId>
<artifactId>assemblies</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml
index df2a2de..afe4fa2 100644
--- a/assemblies/apache-karaf/pom.xml
+++ b/assemblies/apache-karaf/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.assemblies</groupId>
<artifactId>assemblies</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/assemblies/features/base/pom.xml b/assemblies/features/base/pom.xml
index 28b16da..5d6f495 100644
--- a/assemblies/features/base/pom.xml
+++ b/assemblies/features/base/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.assemblies.features</groupId>
<artifactId>features</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
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 a65cf7a..01ef06f 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
@@ -60,8 +60,8 @@ org.osgi.framework.system.packages= \
org.osgi.dto;version="1.1",\
org.osgi.resource;version="1.0",\
org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto",\
- org.osgi.framework;version="1.9",\
- org.osgi.framework.dto;version="1.9";uses:="org.osgi.dto",\
+ org.osgi.framework;version="1.10",\
+ org.osgi.framework.dto;version="1.10";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",\
diff --git a/assemblies/features/enterprise/pom.xml b/assemblies/features/enterprise/pom.xml
index 4234457..ff41441 100644
--- a/assemblies/features/enterprise/pom.xml
+++ b/assemblies/features/enterprise/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.assemblies.features</groupId>
<artifactId>features</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/assemblies/features/framework/pom.xml b/assemblies/features/framework/pom.xml
index 8d99fa6..bee516a 100644
--- a/assemblies/features/framework/pom.xml
+++ b/assemblies/features/framework/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.assemblies.features</groupId>
<artifactId>features</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/assemblies/features/pom.xml b/assemblies/features/pom.xml
index 13da4ff..1e7a363 100644
--- a/assemblies/features/pom.xml
+++ b/assemblies/features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.assemblies</groupId>
<artifactId>assemblies</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/assemblies/features/specs/pom.xml b/assemblies/features/specs/pom.xml
index 6c9329f..f7f8bd4 100644
--- a/assemblies/features/specs/pom.xml
+++ b/assemblies/features/specs/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.assemblies.features</groupId>
<artifactId>features</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/assemblies/features/spring-legacy/pom.xml b/assemblies/features/spring-legacy/pom.xml
index e18d78e..ddf0548 100644
--- a/assemblies/features/spring-legacy/pom.xml
+++ b/assemblies/features/spring-legacy/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.assemblies.features</groupId>
<artifactId>features</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/assemblies/features/spring/pom.xml b/assemblies/features/spring/pom.xml
index 24211a2..6055ff3 100644
--- a/assemblies/features/spring/pom.xml
+++ b/assemblies/features/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.assemblies.features</groupId>
<artifactId>features</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml
index 2a0d616..9d93aee 100644
--- a/assemblies/features/standard/pom.xml
+++ b/assemblies/features/standard/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.assemblies.features</groupId>
<artifactId>features</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/assemblies/features/static/pom.xml b/assemblies/features/static/pom.xml
index 01737b1..2ac2400 100644
--- a/assemblies/features/static/pom.xml
+++ b/assemblies/features/static/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.assemblies.features</groupId>
<artifactId>features</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/assemblies/pom.xml b/assemblies/pom.xml
index 3cc9ea7..588e5af 100644
--- a/assemblies/pom.xml
+++ b/assemblies/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/audit/pom.xml b/audit/pom.xml
index 5ea2889..48a4bce 100644
--- a/audit/pom.xml
+++ b/audit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -55,11 +55,9 @@
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
</dependency>
-
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.cm</artifactId>
</dependency>
<dependency>
diff --git a/bom/pom.xml b/bom/pom.xml
index 52edaf5..47979c8 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -41,6 +41,73 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <version>${org.osgi.service.cm.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <version>${org.osgi.service.component.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <version>${org.osgi.service.component.annotations.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <version>${org.osgi.service.event.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.http</artifactId>
+ <version>${org.osgi.service.http.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.jdbc</artifactId>
+ <version>${org.osgi.service.jdbc.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.log</artifactId>
+ <version>${org.osgi.service.log.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.metatype</artifactId>
+ <version>${org.osgi.service.metatype.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.namespace.service</artifactId>
+ <version>${org.osgi.service.namespace.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.repository</artifactId>
+ <version>${org.osgi.service.repository.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.promise</artifactId>
+ <version>${org.osgi.util.promise.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>manual</artifactId>
<version>${project.version}</version>
@@ -528,16 +595,6 @@
<version>${felix.obr.version}</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>${osgi.compendium.version}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jdbc</artifactId>
- <version>${org.osgi.service.jdbc.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
<version>${felix.configadmin.version}</version>
diff --git a/bundle/blueprintstate/pom.xml b/bundle/blueprintstate/pom.xml
index 5b07b60..d2bd2a5 100644
--- a/bundle/blueprintstate/pom.xml
+++ b/bundle/blueprintstate/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.bundle</groupId>
<artifactId>bundle</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/bundle/core/pom.xml b/bundle/core/pom.xml
index 3cefc20..e86768a 100644
--- a/bundle/core/pom.xml
+++ b/bundle/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.bundle</groupId>
<artifactId>bundle</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -64,9 +64,10 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.cm</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
diff --git a/bundle/pom.xml b/bundle/pom.xml
index c05f5ce..9080b8d 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/bundle/springstate/pom.xml b/bundle/springstate/pom.xml
index aab27d0..69ce65b 100644
--- a/bundle/springstate/pom.xml
+++ b/bundle/springstate/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.bundle</groupId>
<artifactId>bundle</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/client/pom.xml b/client/pom.xml
index a188465..db96c39 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/config/pom.xml b/config/pom.xml
index 1b52691..84ab60c 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -54,11 +54,22 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.metatype</artifactId>
+ <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.util.converter</artifactId>
+ <version>1.0.1</version>
<scope>provided</scope>
</dependency>
diff --git a/deployer/blueprint/pom.xml b/deployer/blueprint/pom.xml
index 8adc391..6119f22 100644
--- a/deployer/blueprint/pom.xml
+++ b/deployer/blueprint/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.deployer</groupId>
<artifactId>deployer</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/deployer/features/pom.xml b/deployer/features/pom.xml
index 7b2e5f1..069e1b4 100644
--- a/deployer/features/pom.xml
+++ b/deployer/features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.deployer</groupId>
<artifactId>deployer</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -66,11 +66,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
<scope>provided</scope>
diff --git a/deployer/kar/pom.xml b/deployer/kar/pom.xml
index 2ca74cc..73d2c49 100644
--- a/deployer/kar/pom.xml
+++ b/deployer/kar/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.deployer</groupId>
<artifactId>deployer</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -65,11 +65,6 @@
<artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
diff --git a/deployer/pom.xml b/deployer/pom.xml
index 777c789..c40f42d 100644
--- a/deployer/pom.xml
+++ b/deployer/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/deployer/spring/pom.xml b/deployer/spring/pom.xml
index 8a2f487..4625d17 100644
--- a/deployer/spring/pom.xml
+++ b/deployer/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.deployer</groupId>
<artifactId>deployer</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/deployer/wrap/pom.xml b/deployer/wrap/pom.xml
index 303c16b..30610d8 100644
--- a/deployer/wrap/pom.xml
+++ b/deployer/wrap/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.deployer</groupId>
<artifactId>deployer</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/diagnostic/boot/pom.xml b/diagnostic/boot/pom.xml
index 00ae485..5bd3a2d 100644
--- a/diagnostic/boot/pom.xml
+++ b/diagnostic/boot/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.diagnostic</groupId>
<artifactId>diagnostic</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/diagnostic/core/pom.xml b/diagnostic/core/pom.xml
index d5b0a2a..e6ee605 100644
--- a/diagnostic/core/pom.xml
+++ b/diagnostic/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.diagnostic</groupId>
<artifactId>diagnostic</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -56,10 +56,9 @@
<artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.cm</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/diagnostic/pom.xml b/diagnostic/pom.xml
index 9d15191..e0c728d 100644
--- a/diagnostic/pom.xml
+++ b/diagnostic/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/docker/pom.xml b/docker/pom.xml
index 640ffbc..191d9bd 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -56,11 +56,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
diff --git a/event/pom.xml b/event/pom.xml
index 38f0c57..2587f9f 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>karaf</artifactId>
<groupId>org.apache.karaf</groupId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -75,11 +75,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.core</artifactId>
</dependency>
diff --git a/examples/karaf-blueprint-example/karaf-blueprint-example-client/pom.xml b/examples/karaf-blueprint-example/karaf-blueprint-example-client/pom.xml
index 0378efe..97adf25 100644
--- a/examples/karaf-blueprint-example/karaf-blueprint-example-client/pom.xml
+++ b/examples/karaf-blueprint-example/karaf-blueprint-example-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-blueprint-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml b/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml
index 23836db..36afdf2 100644
--- a/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml
+++ b/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-blueprint-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-blueprint-example/karaf-blueprint-example-features/pom.xml b/examples/karaf-blueprint-example/karaf-blueprint-example-features/pom.xml
index 96d1c64..041afbe 100644
--- a/examples/karaf-blueprint-example/karaf-blueprint-example-features/pom.xml
+++ b/examples/karaf-blueprint-example/karaf-blueprint-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-blueprint-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-blueprint-example/karaf-blueprint-example-provider/pom.xml b/examples/karaf-blueprint-example/karaf-blueprint-example-provider/pom.xml
index ca0ef33..0aaa9c5 100644
--- a/examples/karaf-blueprint-example/karaf-blueprint-example-provider/pom.xml
+++ b/examples/karaf-blueprint-example/karaf-blueprint-example-provider/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-blueprint-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-blueprint-example/pom.xml b/examples/karaf-blueprint-example/pom.xml
index f17b42a..2f9fe9e 100644
--- a/examples/karaf-blueprint-example/pom.xml
+++ b/examples/karaf-blueprint-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-branding-example/pom.xml b/examples/karaf-branding-example/pom.xml
index 108330c..678a5e2 100644
--- a/examples/karaf-branding-example/pom.xml
+++ b/examples/karaf-branding-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
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 753c896..34e9c9a 100644
--- a/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml
+++ b/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-bundle-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml b/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml
index 75fa97c..462743f 100644
--- a/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml
+++ b/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-bundle-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-bundle-example/karaf-bundle-example-features/pom.xml b/examples/karaf-bundle-example/karaf-bundle-example-features/pom.xml
index bbbcdac..3f7cc23 100644
--- a/examples/karaf-bundle-example/karaf-bundle-example-features/pom.xml
+++ b/examples/karaf-bundle-example/karaf-bundle-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-bundle-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
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 49c9d67..8fbefaf 100644
--- a/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml
+++ b/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-bundle-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-bundle-example/pom.xml b/examples/karaf-bundle-example/pom.xml
index 21f7f3a..c9a6e09 100644
--- a/examples/karaf-bundle-example/pom.xml
+++ b/examples/karaf-bundle-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-camel-example/karaf-camel-example-blueprint/pom.xml b/examples/karaf-camel-example/karaf-camel-example-blueprint/pom.xml
index 5a29a64..9c624c7 100644
--- a/examples/karaf-camel-example/karaf-camel-example-blueprint/pom.xml
+++ b/examples/karaf-camel-example/karaf-camel-example-blueprint/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-camel-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-camel-example/karaf-camel-example-features/pom.xml b/examples/karaf-camel-example/karaf-camel-example-features/pom.xml
index de75d27..802ad4d 100644
--- a/examples/karaf-camel-example/karaf-camel-example-features/pom.xml
+++ b/examples/karaf-camel-example/karaf-camel-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-camel-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-camel-example/karaf-camel-example-java/pom.xml b/examples/karaf-camel-example/karaf-camel-example-java/pom.xml
index aee963a..3500b26 100644
--- a/examples/karaf-camel-example/karaf-camel-example-java/pom.xml
+++ b/examples/karaf-camel-example/karaf-camel-example-java/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-camel-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -53,10 +53,17 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/examples/karaf-camel-example/pom.xml b/examples/karaf-camel-example/pom.xml
index 5363da7..ae692d4 100644
--- a/examples/karaf-camel-example/pom.xml
+++ b/examples/karaf-camel-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml
index 6dbdbf3..6306219 100644
--- a/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml
+++ b/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-cdi-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml
index 3ace1ee..0f49ec0 100644
--- a/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml
+++ b/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-cdi-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml
index 7f94258..9d17e36 100644
--- a/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml
+++ b/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-cdi-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml
index 04ce07c..6d19fab 100644
--- a/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml
+++ b/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-cdi-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-cdi-example/pom.xml b/examples/karaf-cdi-example/pom.xml
index ba70fbb..fbd14cd 100644
--- a/examples/karaf-cdi-example/pom.xml
+++ b/examples/karaf-cdi-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-command-example/karaf-command-example-api/pom.xml b/examples/karaf-command-example/karaf-command-example-api/pom.xml
index 831ca0c..ca5af88 100644
--- a/examples/karaf-command-example/karaf-command-example-api/pom.xml
+++ b/examples/karaf-command-example/karaf-command-example-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-command-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-command-example/karaf-command-example-command/pom.xml b/examples/karaf-command-example/karaf-command-example-command/pom.xml
index b541752..e0687e6 100644
--- a/examples/karaf-command-example/karaf-command-example-command/pom.xml
+++ b/examples/karaf-command-example/karaf-command-example-command/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-command-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-command-example/karaf-command-example-features/pom.xml b/examples/karaf-command-example/karaf-command-example-features/pom.xml
index b11476d..144bb74 100644
--- a/examples/karaf-command-example/karaf-command-example-features/pom.xml
+++ b/examples/karaf-command-example/karaf-command-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-command-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-command-example/karaf-command-example-provider/pom.xml b/examples/karaf-command-example/karaf-command-example-provider/pom.xml
index 6b5b539..6ab47c2 100644
--- a/examples/karaf-command-example/karaf-command-example-provider/pom.xml
+++ b/examples/karaf-command-example/karaf-command-example-provider/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-command-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-command-example/pom.xml b/examples/karaf-command-example/pom.xml
index 28cafe1..98a6713 100644
--- a/examples/karaf-command-example/pom.xml
+++ b/examples/karaf-command-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-config-example/karaf-config-example-blueprint/pom.xml b/examples/karaf-config-example/karaf-config-example-blueprint/pom.xml
index 12511e0..3ae34a9 100644
--- a/examples/karaf-config-example/karaf-config-example-blueprint/pom.xml
+++ b/examples/karaf-config-example/karaf-config-example-blueprint/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-config-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-config-example/karaf-config-example-features/pom.xml b/examples/karaf-config-example/karaf-config-example-features/pom.xml
index b261d3b..0f5e157 100644
--- a/examples/karaf-config-example/karaf-config-example-features/pom.xml
+++ b/examples/karaf-config-example/karaf-config-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-config-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-config-example/karaf-config-example-listener/pom.xml b/examples/karaf-config-example/karaf-config-example-listener/pom.xml
index 8750906..bacc58a 100644
--- a/examples/karaf-config-example/karaf-config-example-listener/pom.xml
+++ b/examples/karaf-config-example/karaf-config-example-listener/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-config-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -36,17 +36,20 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>7.0.0</version>
+ <version>8.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>7.0.0</version>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <version>1.6.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
- <version>7.0.0</version>
+ <version>8.0.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/examples/karaf-config-example/karaf-config-example-managed-factory/pom.xml b/examples/karaf-config-example/karaf-config-example-managed-factory/pom.xml
index d3f5696..94b2a0e 100644
--- a/examples/karaf-config-example/karaf-config-example-managed-factory/pom.xml
+++ b/examples/karaf-config-example/karaf-config-example-managed-factory/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-config-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -36,17 +36,20 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>7.0.0</version>
+ <version>8.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>7.0.0</version>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <version>1.6.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
- <version>7.0.0</version>
+ <version>8.0.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/examples/karaf-config-example/karaf-config-example-managed/pom.xml b/examples/karaf-config-example/karaf-config-example-managed/pom.xml
index ef53012..cec57a9 100644
--- a/examples/karaf-config-example/karaf-config-example-managed/pom.xml
+++ b/examples/karaf-config-example/karaf-config-example-managed/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-config-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -36,17 +36,17 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>7.0.0</version>
+ <version>8.0.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>7.0.0</version>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
- <version>7.0.0</version>
+ <version>8.0.0</version>
</dependency>
</dependencies>
diff --git a/examples/karaf-config-example/karaf-config-example-scr/pom.xml b/examples/karaf-config-example/karaf-config-example-scr/pom.xml
index 7e5021a..9a6568c 100644
--- a/examples/karaf-config-example/karaf-config-example-scr/pom.xml
+++ b/examples/karaf-config-example/karaf-config-example-scr/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-config-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -35,8 +35,15 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <artifactId>org.osgi.service.component</artifactId>
+ <version>1.4.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <version>1.4.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/examples/karaf-config-example/karaf-config-example-static/pom.xml b/examples/karaf-config-example/karaf-config-example-static/pom.xml
index faedb5b..18678b5 100644
--- a/examples/karaf-config-example/karaf-config-example-static/pom.xml
+++ b/examples/karaf-config-example/karaf-config-example-static/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-config-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -36,17 +36,20 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>7.0.0</version>
+ <version>8.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>7.0.0</version>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <version>1.6.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
- <version>7.0.0</version>
+ <version>8.0.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/examples/karaf-config-example/pom.xml b/examples/karaf-config-example/pom.xml
index 9c4a567..1bc010c 100644
--- a/examples/karaf-config-example/pom.xml
+++ b/examples/karaf-config-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-deployer-example/pom.xml b/examples/karaf-deployer-example/pom.xml
index 725cf64..78af4e4 100644
--- a/examples/karaf-deployer-example/pom.xml
+++ b/examples/karaf-deployer-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -48,13 +48,12 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>7.0.0</version>
+ <version>8.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>7.0.0</version>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/examples/karaf-docker-example/karaf-docker-example-app/pom.xml b/examples/karaf-docker-example/karaf-docker-example-app/pom.xml
index 01dadfc..5c956b0 100644
--- a/examples/karaf-docker-example/karaf-docker-example-app/pom.xml
+++ b/examples/karaf-docker-example/karaf-docker-example-app/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-docker-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -46,6 +46,11 @@
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
@@ -56,12 +61,6 @@
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
diff --git a/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml b/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml
index 5b97fb2..d566c08 100644
--- a/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml
+++ b/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-docker-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml b/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml
index d473f3c..6bcf29a 100644
--- a/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml
+++ b/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-docker-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-docker-example/pom.xml b/examples/karaf-docker-example/pom.xml
index ed618a3..d40a9bb 100644
--- a/examples/karaf-docker-example/pom.xml
+++ b/examples/karaf-docker-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-dump-example/pom.xml b/examples/karaf-dump-example/pom.xml
index e72d8ee..9f5d57f 100644
--- a/examples/karaf-dump-example/pom.xml
+++ b/examples/karaf-dump-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -47,13 +47,14 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>7.0.0</version>
+ <artifactId>osgi.annotation</artifactId>
+ <version>8.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.annotation</artifactId>
- <version>7.0.0</version>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.diagnostic</groupId>
diff --git a/examples/karaf-http-resource-example/karaf-http-resource-example-features/pom.xml b/examples/karaf-http-resource-example/karaf-http-resource-example-features/pom.xml
index c94eef7..bbdaa3b 100644
--- a/examples/karaf-http-resource-example/karaf-http-resource-example-features/pom.xml
+++ b/examples/karaf-http-resource-example/karaf-http-resource-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-http-resource-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/pom.xml b/examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/pom.xml
index e2119a7..3a20c30 100644
--- a/examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/pom.xml
+++ b/examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-http-resource-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -35,8 +35,9 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <version>1.4.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/examples/karaf-http-resource-example/pom.xml b/examples/karaf-http-resource-example/pom.xml
index c0c12be..3c2ba1f 100644
--- a/examples/karaf-http-resource-example/pom.xml
+++ b/examples/karaf-http-resource-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-itest-example/pom.xml b/examples/karaf-itest-example/pom.xml
index 9ae9d2f..d9fb214 100644
--- a/examples/karaf-itest-example/pom.xml
+++ b/examples/karaf-itest-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml b/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml
index d89509d..7e1708e 100644
--- a/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml
+++ b/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jaas-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -52,15 +52,18 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
- <version>7.0.0</version>
+ <version>8.0.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/examples/karaf-jaas-example/karaf-jaas-example-features/pom.xml b/examples/karaf-jaas-example/karaf-jaas-example-features/pom.xml
index 83d470b..45ef4a0 100644
--- a/examples/karaf-jaas-example/karaf-jaas-example-features/pom.xml
+++ b/examples/karaf-jaas-example/karaf-jaas-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jaas-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml b/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml
index 152e562..f3724be 100644
--- a/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml
+++ b/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jaas-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml b/examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml
index c9f8ca9..a22e028 100644
--- a/examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml
+++ b/examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jaas-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-jaas-example/pom.xml b/examples/karaf-jaas-example/pom.xml
index a831304..be555e9 100644
--- a/examples/karaf-jaas-example/pom.xml
+++ b/examples/karaf-jaas-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml b/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml
index 716c3f1..a689540 100644
--- a/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml
+++ b/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jdbc-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-command/pom.xml b/examples/karaf-jdbc-example/karaf-jdbc-example-command/pom.xml
index f1ce750..cf2deef 100644
--- a/examples/karaf-jdbc-example/karaf-jdbc-example-command/pom.xml
+++ b/examples/karaf-jdbc-example/karaf-jdbc-example-command/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jdbc-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-features/pom.xml b/examples/karaf-jdbc-example/karaf-jdbc-example-features/pom.xml
index df80b0f..dd4420c 100644
--- a/examples/karaf-jdbc-example/karaf-jdbc-example-features/pom.xml
+++ b/examples/karaf-jdbc-example/karaf-jdbc-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jdbc-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml b/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml
index e899253..ea7579d 100644
--- a/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml
+++ b/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jdbc-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -57,12 +57,17 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>7.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>7.0.0</version>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/examples/karaf-jdbc-example/pom.xml b/examples/karaf-jdbc-example/pom.xml
index 07a61f0..45dd6c1 100644
--- a/examples/karaf-jdbc-example/pom.xml
+++ b/examples/karaf-jdbc-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-jms-example/karaf-jms-example-command/pom.xml b/examples/karaf-jms-example/karaf-jms-example-command/pom.xml
index 669f836..39c1b64 100644
--- a/examples/karaf-jms-example/karaf-jms-example-command/pom.xml
+++ b/examples/karaf-jms-example/karaf-jms-example-command/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jms-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-jms-example/karaf-jms-example-features/pom.xml b/examples/karaf-jms-example/karaf-jms-example-features/pom.xml
index 6006a17..d2ab6e5 100644
--- a/examples/karaf-jms-example/karaf-jms-example-features/pom.xml
+++ b/examples/karaf-jms-example/karaf-jms-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jms-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-jms-example/pom.xml b/examples/karaf-jms-example/pom.xml
index 57e3f6e..612c4c5 100644
--- a/examples/karaf-jms-example/pom.xml
+++ b/examples/karaf-jms-example/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml
index 6f9f04a..7568c37 100644
--- a/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml
+++ b/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jpa-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml
index 3488f23..e65d18b 100644
--- a/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml
+++ b/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jpa-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml
index 8108d56..d4e0738 100644
--- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml
+++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jpa-example-provider</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml
index 83bda9b..a2cd427 100644
--- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml
+++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jpa-example-provider-blueprint</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml
index 0212f31..62f4222 100644
--- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml
+++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jpa-example-provider-blueprint</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml
index 3015846..a79eef4 100644
--- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml
+++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jpa-example-provider-blueprint</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml
index 45ff225..679a880 100644
--- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml
+++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jpa-example-provider</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
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 d743596..ed32f48 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
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jpa-example-provider-ds</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -68,12 +68,12 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
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 f7dcfe9..f7a9e65 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
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jpa-example-provider-ds</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -68,12 +68,12 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
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 e405451..1affe39 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
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jpa-example-provider-ds</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -68,12 +68,12 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml
index 116090f..df0b9d7 100644
--- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml
+++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jpa-example-provider</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml
index e6387f6..2b9fe40 100644
--- a/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml
+++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-jpa-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-jpa-example/pom.xml b/examples/karaf-jpa-example/pom.xml
index 9db52d5..583c327 100644
--- a/examples/karaf-jpa-example/pom.xml
+++ b/examples/karaf-jpa-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml b/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml
index 4a430f0..7d603cf 100644
--- a/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml
+++ b/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-log-appender-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -49,11 +49,6 @@
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-log4j1</artifactId>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>7.0.0</version>
- </dependency>
</dependencies>
<build>
diff --git a/examples/karaf-log-appender-example/karaf-log-appender-example-features/pom.xml b/examples/karaf-log-appender-example/karaf-log-appender-example-features/pom.xml
index 97d9319..6f7796e 100644
--- a/examples/karaf-log-appender-example/karaf-log-appender-example-features/pom.xml
+++ b/examples/karaf-log-appender-example/karaf-log-appender-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-log-appender-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-log-appender-example/pom.xml b/examples/karaf-log-appender-example/pom.xml
index a672af2..3426d73 100644
--- a/examples/karaf-log-appender-example/pom.xml
+++ b/examples/karaf-log-appender-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
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 f3d13e9..f2c40fc 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
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-maven-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-maven-example/karaf-maven-example-run/pom.xml b/examples/karaf-maven-example/karaf-maven-example-run/pom.xml
index edad03e..b502a1e 100644
--- a/examples/karaf-maven-example/karaf-maven-example-run/pom.xml
+++ b/examples/karaf-maven-example/karaf-maven-example-run/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-maven-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-maven-example/pom.xml b/examples/karaf-maven-example/pom.xml
index e18fada..e26f02d 100644
--- a/examples/karaf-maven-example/pom.xml
+++ b/examples/karaf-maven-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml
index de3f039..27d6612 100644
--- a/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml
+++ b/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-mbean-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml
index 969043a..7dd8c49 100644
--- a/examples/karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml
+++ b/examples/karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-mbean-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-mbean-example/karaf-mbean-example-features/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-features/pom.xml
index 53b8d51..f91a38d 100644
--- a/examples/karaf-mbean-example/karaf-mbean-example-features/pom.xml
+++ b/examples/karaf-mbean-example/karaf-mbean-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-mbean-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml
index 6be802a..d79def1 100644
--- a/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml
+++ b/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-mbean-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml
index 9fe0b60..5e6f735 100644
--- a/examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml
+++ b/examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-mbean-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -40,8 +40,9 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <version>1.4.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml
index 3131258..2f36656 100644
--- a/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml
+++ b/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-mbean-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-mbean-example/pom.xml b/examples/karaf-mbean-example/pom.xml
index 4df18c8..a947c85 100644
--- a/examples/karaf-mbean-example/pom.xml
+++ b/examples/karaf-mbean-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-redis-example/karaf-redis-example-api/pom.xml b/examples/karaf-redis-example/karaf-redis-example-api/pom.xml
index 2553c44..da3bccd 100644
--- a/examples/karaf-redis-example/karaf-redis-example-api/pom.xml
+++ b/examples/karaf-redis-example/karaf-redis-example-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-redis-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-redis-example/karaf-redis-example-command/pom.xml b/examples/karaf-redis-example/karaf-redis-example-command/pom.xml
index 1dc91c8..50ac7bd 100644
--- a/examples/karaf-redis-example/karaf-redis-example-command/pom.xml
+++ b/examples/karaf-redis-example/karaf-redis-example-command/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-redis-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-redis-example/karaf-redis-example-features/pom.xml b/examples/karaf-redis-example/karaf-redis-example-features/pom.xml
index 34ff1ed..2791d8f 100644
--- a/examples/karaf-redis-example/karaf-redis-example-features/pom.xml
+++ b/examples/karaf-redis-example/karaf-redis-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-redis-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-redis-example/karaf-redis-example-service/pom.xml b/examples/karaf-redis-example/karaf-redis-example-service/pom.xml
index fd0dd9c..8e56c04 100644
--- a/examples/karaf-redis-example/karaf-redis-example-service/pom.xml
+++ b/examples/karaf-redis-example/karaf-redis-example-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-redis-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -53,10 +53,12 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
diff --git a/examples/karaf-redis-example/pom.xml b/examples/karaf-redis-example/pom.xml
index 0641bdb..bec1394 100644
--- a/examples/karaf-redis-example/pom.xml
+++ b/examples/karaf-redis-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-rest-example/karaf-rest-example-api/pom.xml b/examples/karaf-rest-example/karaf-rest-example-api/pom.xml
index 5986ee2..14b9f74 100644
--- a/examples/karaf-rest-example/karaf-rest-example-api/pom.xml
+++ b/examples/karaf-rest-example/karaf-rest-example-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-rest-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml b/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml
index 004f254..6c313f1 100644
--- a/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml
+++ b/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-rest-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml
index ea2d57a..50ec379 100644
--- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml
+++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-rest-example-client</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/pom.xml
index 22a142b..9cb55a2 100644
--- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/pom.xml
+++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-rest-example-client</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml
index 1c694be..2f020a2 100644
--- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml
+++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-rest-example-client</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-rest-example/karaf-rest-example-client/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/pom.xml
index 5d9eb6a..8b649d4 100644
--- a/examples/karaf-rest-example/karaf-rest-example-client/pom.xml
+++ b/examples/karaf-rest-example/karaf-rest-example-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-rest-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-rest-example/karaf-rest-example-features/pom.xml b/examples/karaf-rest-example/karaf-rest-example-features/pom.xml
index 36af68b..00e77dc 100644
--- a/examples/karaf-rest-example/karaf-rest-example-features/pom.xml
+++ b/examples/karaf-rest-example/karaf-rest-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-rest-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml b/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml
index 72f2237..77acaa9 100644
--- a/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml
+++ b/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-rest-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -48,10 +48,12 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
diff --git a/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml b/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml
index d5b7c17..31e3789 100644
--- a/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml
+++ b/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-rest-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -35,8 +35,9 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <version>1.4.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
diff --git a/examples/karaf-rest-example/pom.xml b/examples/karaf-rest-example/pom.xml
index e175595..d9e6e4e 100644
--- a/examples/karaf-rest-example/pom.xml
+++ b/examples/karaf-rest-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-scheduler-example/karaf-scheduler-example-features/pom.xml b/examples/karaf-scheduler-example/karaf-scheduler-example-features/pom.xml
index 9222142..cfb4fa9 100644
--- a/examples/karaf-scheduler-example/karaf-scheduler-example-features/pom.xml
+++ b/examples/karaf-scheduler-example/karaf-scheduler-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-scheduler-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml b/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml
index 1c8486e..76acda9 100644
--- a/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml
+++ b/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-scheduler-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -35,8 +35,9 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>7.0.0</version>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <version>1.4.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/examples/karaf-scheduler-example/pom.xml b/examples/karaf-scheduler-example/pom.xml
index 8b49a02..86a087e 100644
--- a/examples/karaf-scheduler-example/pom.xml
+++ b/examples/karaf-scheduler-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-scr-example/karaf-scr-example-api/pom.xml b/examples/karaf-scr-example/karaf-scr-example-api/pom.xml
index 9604cdc..f170bfa 100644
--- a/examples/karaf-scr-example/karaf-scr-example-api/pom.xml
+++ b/examples/karaf-scr-example/karaf-scr-example-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-scr-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-scr-example/karaf-scr-example-client/pom.xml b/examples/karaf-scr-example/karaf-scr-example-client/pom.xml
index 4e5660a..d178670 100644
--- a/examples/karaf-scr-example/karaf-scr-example-client/pom.xml
+++ b/examples/karaf-scr-example/karaf-scr-example-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-scr-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -40,8 +40,9 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <version>1.4.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/examples/karaf-scr-example/karaf-scr-example-features/pom.xml b/examples/karaf-scr-example/karaf-scr-example-features/pom.xml
index 5adb7ef..abed771 100644
--- a/examples/karaf-scr-example/karaf-scr-example-features/pom.xml
+++ b/examples/karaf-scr-example/karaf-scr-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-scr-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-scr-example/karaf-scr-example-provider/pom.xml b/examples/karaf-scr-example/karaf-scr-example-provider/pom.xml
index e895ea2..0e49d57 100644
--- a/examples/karaf-scr-example/karaf-scr-example-provider/pom.xml
+++ b/examples/karaf-scr-example/karaf-scr-example-provider/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-scr-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -40,8 +40,9 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <version>1.4.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/examples/karaf-scr-example/pom.xml b/examples/karaf-scr-example/pom.xml
index f46b7b3..642b982 100644
--- a/examples/karaf-scr-example/pom.xml
+++ b/examples/karaf-scr-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml
index 64413dd..32dc06b 100644
--- a/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml
+++ b/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-servlet-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml
index 10a9cbf..54eea93 100644
--- a/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml
+++ b/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-servlet-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-servlet-example/karaf-servlet-example-features/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-features/pom.xml
index 7db1b87..ee8cfb6 100644
--- a/examples/karaf-servlet-example/karaf-servlet-example-features/pom.xml
+++ b/examples/karaf-servlet-example/karaf-servlet-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-servlet-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml
index 9b9287a..1cd637a 100644
--- a/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml
+++ b/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-servlet-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -41,17 +41,20 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>7.0.0</version>
+ <version>8.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>7.0.0</version>
+ <artifactId>org.osgi.service.http</artifactId>
+ <version>1.2.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
- <version>7.0.0</version>
+ <version>8.0.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml
index b6cc5a1..9625693 100644
--- a/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml
+++ b/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-servlet-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -34,15 +34,16 @@
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <version>1.4.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
- </dependency>
</dependencies>
<build>
diff --git a/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml
index 1d8e8d1..9a74dce 100644
--- a/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml
+++ b/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-servlet-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -34,14 +34,21 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <version>1.4.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <artifactId>org.osgi.service.http</artifactId>
+ <version>1.2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
</dependency>
</dependencies>
diff --git a/examples/karaf-servlet-example/pom.xml b/examples/karaf-servlet-example/pom.xml
index 57e8e99..b811697 100644
--- a/examples/karaf-servlet-example/pom.xml
+++ b/examples/karaf-servlet-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-soap-example/karaf-soap-example-api/pom.xml b/examples/karaf-soap-example/karaf-soap-example-api/pom.xml
index 0eb1bf6..1b76b7d 100644
--- a/examples/karaf-soap-example/karaf-soap-example-api/pom.xml
+++ b/examples/karaf-soap-example/karaf-soap-example-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-soap-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml b/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml
index a6fd787..c31a7e9 100644
--- a/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml
+++ b/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-soap-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-soap-example/karaf-soap-example-client/pom.xml b/examples/karaf-soap-example/karaf-soap-example-client/pom.xml
index d8f3620..9e22147 100644
--- a/examples/karaf-soap-example/karaf-soap-example-client/pom.xml
+++ b/examples/karaf-soap-example/karaf-soap-example-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-soap-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-soap-example/karaf-soap-example-features/pom.xml b/examples/karaf-soap-example/karaf-soap-example-features/pom.xml
index c66fcce..41df9bb 100644
--- a/examples/karaf-soap-example/karaf-soap-example-features/pom.xml
+++ b/examples/karaf-soap-example/karaf-soap-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-soap-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml b/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml
index c16c128..3e31499 100644
--- a/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml
+++ b/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-soap-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -48,10 +48,12 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
diff --git a/examples/karaf-soap-example/pom.xml b/examples/karaf-soap-example/pom.xml
index 3540982..ec03749 100644
--- a/examples/karaf-soap-example/pom.xml
+++ b/examples/karaf-soap-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-core/pom.xml b/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-core/pom.xml
index 67e3cf1..abbad1b 100644
--- a/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-core/pom.xml
+++ b/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-url-namespace-handler-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -36,12 +36,14 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>7.0.0</version>
+ <version>8.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>7.0.0</version>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <version>1.4.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features/pom.xml b/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features/pom.xml
index 4e2f168..2d4a187 100644
--- a/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features/pom.xml
+++ b/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-url-namespace-handler-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-url-namespace-handler-example/pom.xml b/examples/karaf-url-namespace-handler-example/pom.xml
index d414217..34a1774 100644
--- a/examples/karaf-url-namespace-handler-example/pom.xml
+++ b/examples/karaf-url-namespace-handler-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-war-example/karaf-war-example-features/pom.xml b/examples/karaf-war-example/karaf-war-example-features/pom.xml
index 0d70a05..66c16fe 100644
--- a/examples/karaf-war-example/karaf-war-example-features/pom.xml
+++ b/examples/karaf-war-example/karaf-war-example-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-war-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-war-example/karaf-war-example-webapp/pom.xml b/examples/karaf-war-example/karaf-war-example-webapp/pom.xml
index de59d7e..4330771 100644
--- a/examples/karaf-war-example/karaf-war-example-webapp/pom.xml
+++ b/examples/karaf-war-example/karaf-war-example-webapp/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>karaf-war-example</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-war-example/pom.xml b/examples/karaf-war-example/pom.xml
index adbb17d..697a002 100644
--- a/examples/karaf-war-example/pom.xml
+++ b/examples/karaf-war-example/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/karaf-websocket-example/pom.xml b/examples/karaf-websocket-example/pom.xml
index ee1340e..4af4e68 100644
--- a/examples/karaf-websocket-example/pom.xml
+++ b/examples/karaf-websocket-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.examples</groupId>
<artifactId>apache-karaf-examples</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -36,13 +36,20 @@
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-servlet</artifactId>
- <version>9.4.31.v20200723</version>
+ <version>9.4.43.v20210629</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <version>1.4.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.http</artifactId>
+ <version>1.2.1</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/examples/pom.xml b/examples/pom.xml
index b4180a4..46b26f5 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/features/command/pom.xml b/features/command/pom.xml
index fba19f0..8a8588c 100644
--- a/features/command/pom.xml
+++ b/features/command/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.features</groupId>
<artifactId>features</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -56,11 +56,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
</dependency>
diff --git a/features/core/pom.xml b/features/core/pom.xml
index 151b20b..f380375 100644
--- a/features/core/pom.xml
+++ b/features/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.features</groupId>
<artifactId>features</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -57,7 +57,31 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.namespace.service</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.repository</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.promise</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolver.java b/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolver.java
index 6019e63..a7ec955 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolver.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolver.java
@@ -31,7 +31,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.stream.Collectors;
import org.apache.felix.utils.collections.DictionaryAsMap;
import org.apache.felix.utils.resource.CapabilityImpl;
diff --git a/features/extension/pom.xml b/features/extension/pom.xml
index 63701b3..43469ce 100644
--- a/features/extension/pom.xml
+++ b/features/extension/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.features</groupId>
<artifactId>features</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/features/pom.xml b/features/pom.xml
index f690c21..834b0cf 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/http/pom.xml b/http/pom.xml
index 1fd7670..9ab56df 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -58,9 +58,15 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.cm</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.http</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-spi</artifactId>
diff --git a/instance/pom.xml b/instance/pom.xml
index 4aa0b9f..ba2c448 100644
--- a/instance/pom.xml
+++ b/instance/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -59,12 +59,6 @@
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
diff --git a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties
index f76acc4..c5fca02 100644
--- a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties
+++ b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties
@@ -60,8 +60,8 @@ org.osgi.framework.system.packages= \
org.osgi.dto;version="1.1",\
org.osgi.resource;version="1.0",\
org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto",\
- org.osgi.framework;version="1.9",\
- org.osgi.framework.dto;version="1.9";uses:="org.osgi.dto",\
+ org.osgi.framework;version="1.10",\
+ org.osgi.framework.dto;version="1.10";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",\
diff --git a/itests/common/pom.xml b/itests/common/pom.xml
index 6ca99c4..8a210fe 100644
--- a/itests/common/pom.xml
+++ b/itests/common/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.itests</groupId>
<artifactId>itests</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -88,9 +88,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
</dependency>
<dependency>
diff --git a/itests/pom.xml b/itests/pom.xml
index a3f4daf..d018191 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/itests/test/pom.xml b/itests/test/pom.xml
index ae2b4dc..7fc0d33 100644
--- a/itests/test/pom.xml
+++ b/itests/test/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.itests</groupId>
<artifactId>itests</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -80,11 +80,6 @@
<artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
diff --git a/jaas/blueprint/config/pom.xml b/jaas/blueprint/config/pom.xml
index 14ad08a..0b80e73 100644
--- a/jaas/blueprint/config/pom.xml
+++ b/jaas/blueprint/config/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.jaas.blueprint</groupId>
<artifactId>blueprint</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/jaas/blueprint/jasypt/pom.xml b/jaas/blueprint/jasypt/pom.xml
index 9a39964..b25ef84 100644
--- a/jaas/blueprint/jasypt/pom.xml
+++ b/jaas/blueprint/jasypt/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.jaas.blueprint</groupId>
<artifactId>blueprint</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -85,12 +85,6 @@
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.connect</artifactId>
<scope>test</scope>
diff --git a/jaas/blueprint/pom.xml b/jaas/blueprint/pom.xml
index b4b1a9f..81520a2 100644
--- a/jaas/blueprint/pom.xml
+++ b/jaas/blueprint/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>jaas</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/jaas/boot/pom.xml b/jaas/boot/pom.xml
index 22ffe55..3927213 100644
--- a/jaas/boot/pom.xml
+++ b/jaas/boot/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>jaas</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/jaas/command/pom.xml b/jaas/command/pom.xml
index f5da0ba..b13b610 100644
--- a/jaas/command/pom.xml
+++ b/jaas/command/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>jaas</artifactId>
<groupId>org.apache.karaf.jaas</groupId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/jaas/config/pom.xml b/jaas/config/pom.xml
index bd3858f..3b5bc22 100644
--- a/jaas/config/pom.xml
+++ b/jaas/config/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>jaas</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/jaas/jasypt/pom.xml b/jaas/jasypt/pom.xml
index 07a5965..f9b742b 100644
--- a/jaas/jasypt/pom.xml
+++ b/jaas/jasypt/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>jaas</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -89,12 +89,6 @@
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.connect</artifactId>
<scope>test</scope>
diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml
index c4a51e7..88a8bbb 100644
--- a/jaas/modules/pom.xml
+++ b/jaas/modules/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>jaas</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -77,12 +77,17 @@
<artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.util</artifactId>
diff --git a/jaas/pom.xml b/jaas/pom.xml
index 675bad5..7ae1bce 100644
--- a/jaas/pom.xml
+++ b/jaas/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/jaas/spring-security-crypto/pom.xml b/jaas/spring-security-crypto/pom.xml
index 213d0e8..3498130 100644
--- a/jaas/spring-security-crypto/pom.xml
+++ b/jaas/spring-security-crypto/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>jaas</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -90,12 +90,6 @@
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.connect</artifactId>
<scope>test</scope>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index a4240e7..3ebe200 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -58,7 +58,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.jdbc</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/jms/pom.xml b/jms/pom.xml
index bcad0e5..cda63a0 100644
--- a/jms/pom.xml
+++ b/jms/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -58,7 +58,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.cm</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/jndi/pom.xml b/jndi/pom.xml
index 1970ba1..7611514 100644
--- a/jndi/pom.xml
+++ b/jndi/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/kar/pom.xml b/kar/pom.xml
index be124bb..d1b3377 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -52,23 +52,24 @@
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.utils</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.util</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.utils</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.util</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/log/pom.xml b/log/pom.xml
index fcc12f4..89a822a 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -56,11 +56,6 @@
<artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
@@ -121,6 +116,7 @@
</Export-Package>
<Import-Package>
org.osgi.framework;version="[1,3)",
+ org.osgi.service.log;version="[1.4,2)",
*
</Import-Package>
<Private-Package>
diff --git a/main/pom.xml b/main/pom.xml
index 1d0d724..2343311 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/management/pom.xml b/management/pom.xml
index c2ad19b..9ecaf81 100644
--- a/management/pom.xml
+++ b/management/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/management/server/pom.xml b/management/server/pom.xml
index 8236765..70ef3f7 100644
--- a/management/server/pom.xml
+++ b/management/server/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.management</groupId>
<artifactId>management</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -58,10 +58,16 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.cm</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>org.apache.karaf.jaas.boot</artifactId>
<scope>provided</scope>
diff --git a/manual/pom.xml b/manual/pom.xml
index afb47eb..e145e58 100644
--- a/manual/pom.xml
+++ b/manual/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -200,8 +200,8 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>${osgi.compendium.version}</version>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <version>${org.osgi.service.cm.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/maven/core/pom.xml b/maven/core/pom.xml
index 98ed273..f42b3a7 100644
--- a/maven/core/pom.xml
+++ b/maven/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -53,8 +53,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.cm</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
@@ -128,7 +127,6 @@
!org.eclipse.sisu*,
!javax.inject*,
!com.google.common.collect,
- org.osgi.framework;version="[1,3)",
*
</Import-Package>
<Private-Package>
diff --git a/maven/pom.xml b/maven/pom.xml
index dbe9182..6e0e7d6 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/obr/pom.xml b/obr/pom.xml
index 49ea7f3..733c683 100644
--- a/obr/pom.xml
+++ b/obr/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/package/pom.xml b/package/pom.xml
index de28e35..333a698 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index 3b5b92c..4dc063b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
<packaging>pom</packaging>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<name>Apache Karaf</name>
<inceptionYear>2007</inceptionYear>
@@ -214,8 +214,8 @@
<felix.coordinator.version>1.0.2</felix.coordinator.version>
<felix.converter.version>1.0.14</felix.converter.version>
<felix.fileinstall.version>3.7.0</felix.fileinstall.version>
- <felix.framework.version>6.0.5</felix.framework.version>
- <felix.framework.security.version>2.6.1</felix.framework.security.version>
+ <felix.framework.version>7.0.1</felix.framework.version>
+ <felix.framework.security.version>2.8.1</felix.framework.security.version>
<felix.gogo.runtime.version>1.1.4</felix.gogo.runtime.version>
<felix.gogo.jline.version>1.1.8</felix.gogo.jline.version>
<felix.httplite.version>0.1.6</felix.httplite.version>
@@ -287,10 +287,20 @@
<maven.wagon.version>3.2.0</maven.wagon.version>
<maven-plugin-annotations.version>3.6.0</maven-plugin-annotations.version>
<maven.resolver.version>1.3.1</maven.resolver.version>
+
+ <osgi.version>8.0.0</osgi.version>
+ <org.osgi.service.cm.version>1.6.0</org.osgi.service.cm.version>
+ <org.osgi.service.component.version>1.4.0</org.osgi.service.component.version>
+ <org.osgi.service.component.annotations.version>1.4.0</org.osgi.service.component.annotations.version>
+ <org.osgi.service.event.version>1.4.0</org.osgi.service.event.version>
+ <org.osgi.service.http.version>1.2.1</org.osgi.service.http.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>7.0.0</osgi.version>
- <osgi.compendium.version>7.0.0</osgi.compendium.version>
+ <org.osgi.service.log.version>1.4.0</org.osgi.service.log.version>
+ <org.osgi.service.metatype.version>1.4.0</org.osgi.service.metatype.version>
+ <org.osgi.service.namespace.version>1.0.0</org.osgi.service.namespace.version>
+ <org.osgi.service.repository.version>1.1.0</org.osgi.service.repository.version>
+ <org.osgi.util.promise.version>1.1.1</org.osgi.util.promise.version>
<pax.cdi.version>1.1.4</pax.cdi.version>
<pax.exam.version>4.13.4</pax.exam.version>
diff --git a/profile/pom.xml b/profile/pom.xml
index 93d864f..c2e648c 100644
--- a/profile/pom.xml
+++ b/profile/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -57,10 +57,9 @@
<artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.cm</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/scheduler/pom.xml b/scheduler/pom.xml
index 97a8fee..4a66273 100644
--- a/scheduler/pom.xml
+++ b/scheduler/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -114,7 +114,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.cm</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/scr/management/pom.xml b/scr/management/pom.xml
index 26b8223..90880e0 100644
--- a/scr/management/pom.xml
+++ b/scr/management/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.scr</groupId>
<artifactId>scr</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -62,7 +62,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/scr/pom.xml b/scr/pom.xml
index 053b507..76514be 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/scr/state/pom.xml b/scr/state/pom.xml
index 9b645e1..f01ade4 100644
--- a/scr/state/pom.xml
+++ b/scr/state/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.scr</groupId>
<artifactId>scr</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/service/core/pom.xml b/service/core/pom.xml
index beb4a51..49bc1b4 100644
--- a/service/core/pom.xml
+++ b/service/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.service</groupId>
<artifactId>service</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/service/guard/pom.xml b/service/guard/pom.xml
index e889f73..b690132 100644
--- a/service/guard/pom.xml
+++ b/service/guard/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.service</groupId>
<artifactId>service</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -72,7 +72,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.cm</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/service/pom.xml b/service/pom.xml
index 3995cf3..4f811d7 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/services/coordinator/pom.xml b/services/coordinator/pom.xml
index e8ec9f7..d3c5918 100644
--- a/services/coordinator/pom.xml
+++ b/services/coordinator/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>karaf</artifactId>
<groupId>org.apache.karaf</groupId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/services/eventadmin/pom.xml b/services/eventadmin/pom.xml
index 4adb864..33e6c31 100644
--- a/services/eventadmin/pom.xml
+++ b/services/eventadmin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>karaf</artifactId>
<groupId>org.apache.karaf</groupId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -112,13 +112,18 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.eventadmin</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.metatype</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.eventadmin</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/services/interceptor/api/pom.xml b/services/interceptor/api/pom.xml
index b1d5e56..6f19093 100644
--- a/services/interceptor/api/pom.xml
+++ b/services/interceptor/api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.services</groupId>
<artifactId>org.apache.karaf.services.interceptor</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/services/interceptor/impl/pom.xml b/services/interceptor/impl/pom.xml
index ead15b2..b5e0d9d 100644
--- a/services/interceptor/impl/pom.xml
+++ b/services/interceptor/impl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.services</groupId>
<artifactId>org.apache.karaf.services.interceptor</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/services/interceptor/pom.xml b/services/interceptor/pom.xml
index 0b58901..aab9b7a 100644
--- a/services/interceptor/pom.xml
+++ b/services/interceptor/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.services</groupId>
<artifactId>services</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/services/pom.xml b/services/pom.xml
index 1945c9e..7224aa3 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/services/staticcm/pom.xml b/services/staticcm/pom.xml
index fb4cd6e..3264c8f 100644
--- a/services/staticcm/pom.xml
+++ b/services/staticcm/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>karaf</artifactId>
<groupId>org.apache.karaf</groupId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/shell/commands/pom.xml b/shell/commands/pom.xml
index c286eae..e1ea9b2 100644
--- a/shell/commands/pom.xml
+++ b/shell/commands/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>shell</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -65,11 +65,6 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/shell/console/pom.xml b/shell/console/pom.xml
index f3e5c03..07c9bdb 100644
--- a/shell/console/pom.xml
+++ b/shell/console/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>shell</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -51,6 +51,17 @@
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
@@ -64,16 +75,6 @@
<artifactId>jansi</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>org.apache.karaf.jaas.modules</artifactId>
</dependency>
diff --git a/shell/core/pom.xml b/shell/core/pom.xml
index 61242c1..6d33af2 100644
--- a/shell/core/pom.xml
+++ b/shell/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>shell</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -66,7 +66,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/shell/pom.xml b/shell/pom.xml
index c161469..3930bad 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml
index 1f670f6..edef4d8 100644
--- a/shell/ssh/pom.xml
+++ b/shell/ssh/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>shell</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -66,10 +66,9 @@
<artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.cm</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/shell/table/pom.xml b/shell/table/pom.xml
index d008603..885c282 100644
--- a/shell/table/pom.xml
+++ b/shell/table/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>shell</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/specs/activator/pom.xml b/specs/activator/pom.xml
index 11ce9ef..0532eb9 100644
--- a/specs/activator/pom.xml
+++ b/specs/activator/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.specs</groupId>
<artifactId>specs</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.karaf.specs.activator</artifactId>
diff --git a/specs/java.xml.ws/pom.xml b/specs/java.xml.ws/pom.xml
index 8e8d303..7558886 100644
--- a/specs/java.xml.ws/pom.xml
+++ b/specs/java.xml.ws/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.specs</groupId>
<artifactId>specs</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.karaf.specs.java.xml.ws</artifactId>
diff --git a/specs/java.xml/pom.xml b/specs/java.xml/pom.xml
index 97f3201..42deabf 100644
--- a/specs/java.xml/pom.xml
+++ b/specs/java.xml/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.specs</groupId>
<artifactId>specs</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.karaf.specs.java.xml</artifactId>
diff --git a/specs/locator/pom.xml b/specs/locator/pom.xml
index 92a32ac..14f3504 100644
--- a/specs/locator/pom.xml
+++ b/specs/locator/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.specs</groupId>
<artifactId>specs</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.karaf.specs.locator</artifactId>
diff --git a/specs/pom.xml b/specs/pom.xml
index 82192b2..bd3214e 100644
--- a/specs/pom.xml
+++ b/specs/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/subsystem/pom.xml b/subsystem/pom.xml
index a4aac72..8514ad5 100644
--- a/subsystem/pom.xml
+++ b/subsystem/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.karaf.subsystem</groupId>
@@ -63,12 +63,6 @@
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
diff --git a/system/pom.xml b/system/pom.xml
index 9857a38..ec9af51 100644
--- a/system/pom.xml
+++ b/system/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml
index 22a2e62..eac87f7 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>tooling</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/tooling/karaf-services-maven-plugin/pom.xml b/tooling/karaf-services-maven-plugin/pom.xml
index 4ba93d6..26577fc 100644
--- a/tooling/karaf-services-maven-plugin/pom.xml
+++ b/tooling/karaf-services-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>tooling</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/tooling/pom.xml b/tooling/pom.xml
index 087774a..9558674 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/tooling/utils/pom.xml b/tooling/utils/pom.xml
index 6ea8f42..a69a692 100644
--- a/tooling/utils/pom.xml
+++ b/tooling/utils/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>tooling</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.karaf.tools.utils</artifactId>
diff --git a/util/pom.xml b/util/pom.xml
index 49ebec8..204231a 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -53,7 +53,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.cm</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/web/pom.xml b/web/pom.xml
index ddd3076..775be20 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/webconsole/console/pom.xml b/webconsole/console/pom.xml
index 9dd2e64..be9ade5 100644
--- a/webconsole/console/pom.xml
+++ b/webconsole/console/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>webconsole</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -59,8 +59,12 @@
<artifactId>osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.http</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
@@ -179,7 +183,7 @@
org.apache.felix.framework;inline=org/apache/felix/framework/util/VersionRange**,
<!-- ServiceTracker -->
- osgi.cmpn;inline=org/osgi/util/tracker/*,
+ osgi.core;inline=org/osgi/util/tracker/*,
<!-- File Upload -->
commons-fileupload,
@@ -187,7 +191,6 @@
<!-- Required by FileUpload and Util -->
commons-io
</Embed-Dependency>
-
<_removeheaders>
Embed-Dependency,Private-Package,Include-Resource
</_removeheaders>
diff --git a/webconsole/features/pom.xml b/webconsole/features/pom.xml
index 0dd2bd5..8751b8c 100644
--- a/webconsole/features/pom.xml
+++ b/webconsole/features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>webconsole</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -56,11 +56,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
diff --git a/webconsole/gogo/pom.xml b/webconsole/gogo/pom.xml
index 4bec607..231b8d1 100644
--- a/webconsole/gogo/pom.xml
+++ b/webconsole/gogo/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>webconsole</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -55,11 +55,6 @@
<artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/webconsole/http/pom.xml b/webconsole/http/pom.xml
index 6c43a50..3521f9a 100644
--- a/webconsole/http/pom.xml
+++ b/webconsole/http/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>webconsole</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -56,11 +56,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
diff --git a/webconsole/instance/pom.xml b/webconsole/instance/pom.xml
index 4770c7f..562feb8 100644
--- a/webconsole/instance/pom.xml
+++ b/webconsole/instance/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>webconsole</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -61,11 +61,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
<scope>provided</scope>
diff --git a/webconsole/pom.xml b/webconsole/pom.xml
index 2cc5fce..4fb9960 100644
--- a/webconsole/pom.xml
+++ b/webconsole/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/wrapper/pom.xml b/wrapper/pom.xml
index 21b7aa3..a241782 100644
--- a/wrapper/pom.xml
+++ b/wrapper/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
- <version>4.3.4-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>