This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.4.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.4.x by this push:
new b522396473 [KARAF-7950] Use modular OSGi dependencies
b522396473 is described below
commit b5223964733da2c8444d5a61d9bac87128112a6a
Author: Robert Varga <[email protected]>
AuthorDate: Wed Apr 23 19:07:26 2025 +0200
[KARAF-7950] Use modular OSGi dependencies
osgi-core is non-modular, i.e. it has no Automatic-Module-Name
declaration.
This patches switches to using org.osgi.{dto,framework,resource,...},
which are provide this stability.
Signed-off-by: Robert Varga <[email protected]>
(cherry picked from commit e62f7cb4c4001421ad6128e731622b202feed88e)
---
audit/pom.xml | 2 +-
bom/pom.xml | 121 +++++++++++++++++++++++++++++++++---
bundle/blueprintstate/pom.xml | 3 +-
bundle/core/pom.xml | 16 +++--
bundle/springstate/pom.xml | 3 +-
config/command/pom.xml | 5 +-
config/core/pom.xml | 9 +--
deployer/blueprint/pom.xml | 7 ++-
deployer/features/pom.xml | 9 +--
deployer/kar/pom.xml | 3 +-
deployer/spring/pom.xml | 7 ++-
deployer/wrap/pom.xml | 7 ++-
diagnostic/boot/pom.xml | 3 +-
diagnostic/core/pom.xml | 8 ++-
docker/pom.xml | 3 +-
event/pom.xml | 7 ++-
features/command/pom.xml | 3 +-
features/core/pom.xml | 18 +++---
features/extension/pom.xml | 7 ++-
http/pom.xml | 5 +-
instance/pom.xml | 3 +-
itests/common/pom.xml | 9 ++-
itests/test/pom.xml | 3 +-
jaas/blueprint/config/pom.xml | 5 --
jaas/boot/pom.xml | 3 +-
jaas/command/pom.xml | 3 +-
jaas/config/pom.xml | 7 ++-
jaas/jasypt/pom.xml | 14 ++---
jaas/modules/pom.xml | 13 ++--
jaas/spring-security-crypto/pom.xml | 14 ++---
jdbc/pom.xml | 5 +-
jms/pom.xml | 4 +-
jndi/pom.xml | 2 +-
kar/pom.xml | 4 +-
log/pom.xml | 7 ++-
main/pom.xml | 3 +-
management/server/pom.xml | 9 +--
maven/core/pom.xml | 2 +-
obr/pom.xml | 3 +-
package/pom.xml | 7 ++-
pom.xml | 17 ++++-
profile/pom.xml | 8 ++-
scheduler/pom.xml | 8 ++-
scr/management/pom.xml | 9 +--
scr/state/pom.xml | 21 +++----
service/core/pom.xml | 7 ++-
service/guard/pom.xml | 12 +++-
services/coordinator/pom.xml | 5 --
services/eventadmin/pom.xml | 9 +--
services/interceptor/impl/pom.xml | 3 +-
services/staticcm/pom.xml | 9 +--
shell/commands/pom.xml | 7 ++-
shell/console/pom.xml | 12 +++-
shell/core/pom.xml | 13 ++--
shell/ssh/pom.xml | 8 ++-
specs/activator/pom.xml | 3 +-
specs/locator/pom.xml | 20 ------
subsystem/pom.xml | 7 ++-
system/pom.xml | 3 +-
util/pom.xml | 16 ++---
web/pom.xml | 3 +-
webconsole/console/pom.xml | 10 ++-
webconsole/features/pom.xml | 3 +-
webconsole/gogo/pom.xml | 3 +-
webconsole/http/pom.xml | 3 +-
webconsole/instance/pom.xml | 3 +-
wrapper/pom.xml | 2 +-
67 files changed, 358 insertions(+), 232 deletions(-)
diff --git a/audit/pom.xml b/audit/pom.xml
index 61d6599b7d..fe2ac81bc2 100644
--- a/audit/pom.xml
+++ b/audit/pom.xml
@@ -53,7 +53,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/bom/pom.xml b/bom/pom.xml
index c74e258ff6..9552dea33c 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -49,12 +49,111 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+
+ <!-- Monolithic OSGi Core. This dependency should not be used by
users. -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
<version>${osgi.version}</version>
<scope>provided</scope>
</dependency>
+
+ <!-- Modular equivalent of osgi.annotation, i.e. the annotation
processing of OSGi Core. -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.bundle</artifactId>
+ <version>${org.osgi.annotation.bundle.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <version>${org.osgi.annotation.versioning.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Modular equivalent of osgi.core, i.e. the run-time of OSGi
Core. -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.dto</artifactId>
+ <version>${org.osgi.dto.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.framework</artifactId>
+ <version>${org.osgi.framework.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.resource</artifactId>
+ <version>${org.osgi.resource.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.condition</artifactId>
+ <version>${org.osgi.service.condition.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.condpermadmin</artifactId>
+ <version>${org.osgi.service.condpermadmin.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>
+ <!-- Note: replaced by org.osgi.framework.wiring since at
least OSGi Core Release 4 -->
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.packageadmin</artifactId>
+ <version>${org.osgi.service.packageadmin.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.permissionadmin</artifactId>
+ <version>${org.osgi.service.permissionadmin.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.resolver</artifactId>
+ <version>${org.osgi.service.resolver.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.startlevel</artifactId>
+ <version>${org.osgi.service.startlevel.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.url</artifactId>
+ <version>${org.osgi.service.url.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
+ <version>${org.osgi.util.tracker.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Modular pieces of osgi.cmpn, i.e. the pieces of OSGi
Companion we support. -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.namespace.service</artifactId>
+ <version>${org.osgi.namespace.service.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
@@ -91,12 +190,6 @@
<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>
@@ -105,8 +198,8 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.namespace.service</artifactId>
- <version>${org.osgi.service.namespace.version}</version>
+ <artifactId>org.osgi.service.metatype.annotations</artifactId>
+
<version>${org.osgi.service.metatype.annotations.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -115,6 +208,18 @@
<version>${org.osgi.service.repository.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.subsystem</artifactId>
+ <version>${org.osgi.service.subsystem.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.converter</artifactId>
+ <version>${org.osgi.util.converter.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.promise</artifactId>
diff --git a/bundle/blueprintstate/pom.xml b/bundle/blueprintstate/pom.xml
index 8448054eeb..14f1b48d98 100644
--- a/bundle/blueprintstate/pom.xml
+++ b/bundle/blueprintstate/pom.xml
@@ -59,8 +59,7 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/bundle/core/pom.xml b/bundle/core/pom.xml
index 9e48d693b1..1fb413af44 100644
--- a/bundle/core/pom.xml
+++ b/bundle/core/pom.xml
@@ -56,16 +56,22 @@
<artifactId>org.apache.aries.blueprint.api</artifactId>
<scope>provided</scope>
</dependency>
-
- <dependency>
+
+ <dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.resource</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<dependency>
diff --git a/bundle/springstate/pom.xml b/bundle/springstate/pom.xml
index f7bc6bb4b3..048abbacba 100644
--- a/bundle/springstate/pom.xml
+++ b/bundle/springstate/pom.xml
@@ -59,8 +59,7 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/config/command/pom.xml b/config/command/pom.xml
index 842074c25d..31ccfba95f 100644
--- a/config/command/pom.xml
+++ b/config/command/pom.xml
@@ -53,18 +53,15 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</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>
diff --git a/config/core/pom.xml b/config/core/pom.xml
index ebb4376f8c..ceba4e0aa8 100644
--- a/config/core/pom.xml
+++ b/config/core/pom.xml
@@ -53,26 +53,21 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</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>org.osgi.util.converter</artifactId>
- <version>1.0.9</version>
- <scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
diff --git a/deployer/blueprint/pom.xml b/deployer/blueprint/pom.xml
index daa4654e90..306db4f890 100644
--- a/deployer/blueprint/pom.xml
+++ b/deployer/blueprint/pom.xml
@@ -68,8 +68,11 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.url</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/deployer/features/pom.xml b/deployer/features/pom.xml
index 41becf8047..ab1e089d9e 100644
--- a/deployer/features/pom.xml
+++ b/deployer/features/pom.xml
@@ -62,14 +62,15 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.annotation.versioning</artifactId>
- <version>${org.osgi.annotation.versioning.version}</version>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.url</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
diff --git a/deployer/kar/pom.xml b/deployer/kar/pom.xml
index 8fd8226621..f49022f4a1 100644
--- a/deployer/kar/pom.xml
+++ b/deployer/kar/pom.xml
@@ -62,8 +62,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
diff --git a/deployer/spring/pom.xml b/deployer/spring/pom.xml
index d54a9e3567..43656ea809 100644
--- a/deployer/spring/pom.xml
+++ b/deployer/spring/pom.xml
@@ -67,8 +67,11 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.url</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
diff --git a/deployer/wrap/pom.xml b/deployer/wrap/pom.xml
index 17df31cf99..4ad92bc0b7 100644
--- a/deployer/wrap/pom.xml
+++ b/deployer/wrap/pom.xml
@@ -57,8 +57,11 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.url</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/diagnostic/boot/pom.xml b/diagnostic/boot/pom.xml
index 966e04baa2..06f222d7df 100644
--- a/diagnostic/boot/pom.xml
+++ b/diagnostic/boot/pom.xml
@@ -53,8 +53,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
</dependencies>
diff --git a/diagnostic/core/pom.xml b/diagnostic/core/pom.xml
index 8d50bd3ae2..0605a2f5ab 100644
--- a/diagnostic/core/pom.xml
+++ b/diagnostic/core/pom.xml
@@ -53,13 +53,15 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<dependency>
diff --git a/docker/pom.xml b/docker/pom.xml
index b6c6ad1c04..b34e09fe7b 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -52,8 +52,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/event/pom.xml b/event/pom.xml
index e363578508..3727733918 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -66,8 +66,11 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/features/command/pom.xml b/features/command/pom.xml
index 734cacd2bc..fa387f197f 100644
--- a/features/command/pom.xml
+++ b/features/command/pom.xml
@@ -52,8 +52,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
diff --git a/features/core/pom.xml b/features/core/pom.xml
index 03c3e4c58e..40e24fee79 100644
--- a/features/core/pom.xml
+++ b/features/core/pom.xml
@@ -52,37 +52,35 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.cm</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.namespace.service</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.event</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.cm</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.namespace.service</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.event</artifactId>
<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.tracker</artifactId>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.promise</artifactId>
- <scope>provided</scope>
<optional>true</optional>
</dependency>
diff --git a/features/extension/pom.xml b/features/extension/pom.xml
index d0facd980f..d22035d630 100644
--- a/features/extension/pom.xml
+++ b/features/extension/pom.xml
@@ -52,8 +52,11 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.resource</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
diff --git a/http/pom.xml b/http/pom.xml
index 3be80e8d3c..efb5524316 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -53,18 +53,15 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</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.http</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
diff --git a/instance/pom.xml b/instance/pom.xml
index afb24e8459..abc889e6b8 100644
--- a/instance/pom.xml
+++ b/instance/pom.xml
@@ -54,8 +54,7 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
diff --git a/itests/common/pom.xml b/itests/common/pom.xml
index 1c74c3ab7b..21d55b0ad9 100644
--- a/itests/common/pom.xml
+++ b/itests/common/pom.xml
@@ -84,8 +84,11 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -121,4 +124,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/itests/test/pom.xml b/itests/test/pom.xml
index 86f4c312aa..a71d879b27 100644
--- a/itests/test/pom.xml
+++ b/itests/test/pom.xml
@@ -77,8 +77,7 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
diff --git a/jaas/blueprint/config/pom.xml b/jaas/blueprint/config/pom.xml
index b046fe4334..b52f7d2188 100644
--- a/jaas/blueprint/config/pom.xml
+++ b/jaas/blueprint/config/pom.xml
@@ -50,11 +50,6 @@
</dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>org.apache.karaf.jaas.boot</artifactId>
diff --git a/jaas/boot/pom.xml b/jaas/boot/pom.xml
index b24777f58f..3c58e5481d 100644
--- a/jaas/boot/pom.xml
+++ b/jaas/boot/pom.xml
@@ -52,8 +52,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
</dependencies>
diff --git a/jaas/command/pom.xml b/jaas/command/pom.xml
index caa437520a..70003c13c5 100644
--- a/jaas/command/pom.xml
+++ b/jaas/command/pom.xml
@@ -52,8 +52,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
diff --git a/jaas/config/pom.xml b/jaas/config/pom.xml
index 1dfe1de2fa..4a8b8fb2ad 100644
--- a/jaas/config/pom.xml
+++ b/jaas/config/pom.xml
@@ -67,8 +67,11 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
diff --git a/jaas/jasypt/pom.xml b/jaas/jasypt/pom.xml
index 86ecbe6f94..8b7bdbc695 100644
--- a/jaas/jasypt/pom.xml
+++ b/jaas/jasypt/pom.xml
@@ -18,21 +18,21 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>jaas</artifactId>
<version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
+
<artifactId>org.apache.karaf.jaas.jasypt</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: JAAS :: Jasypt Encryption</name>
<description>This bundle provide Jasypt service for the encryption support
in the JAAS security framework.</description>
-
+
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
</properties>
@@ -48,17 +48,17 @@
</dependency>
</dependencies>
</dependencyManagement>
-
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
- <artifactId>org.apache.karaf.jaas.modules</artifactId>
+ <artifactId>org.apache.karaf.jaas.modules</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml
index c3fd364858..93940b153c 100644
--- a/jaas/modules/pom.xml
+++ b/jaas/modules/pom.xml
@@ -74,18 +74,19 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</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.event</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<dependency>
@@ -93,7 +94,7 @@
<artifactId>org.apache.karaf.util</artifactId>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
@@ -188,7 +189,7 @@
!net.spy.memcached*,
com.sun.security.auth.module;resolution:=optional,
javax.xml.bind*;version="[2.2,3)",
-
org.apache.commons.logging;version="[1,2)",
+ org.apache.commons.logging;version="[1,2)",
*
</Import-Package>
<Private-Package>
diff --git a/jaas/spring-security-crypto/pom.xml
b/jaas/spring-security-crypto/pom.xml
index 80b4f63cb6..54ac9f01d7 100644
--- a/jaas/spring-security-crypto/pom.xml
+++ b/jaas/spring-security-crypto/pom.xml
@@ -18,21 +18,21 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>jaas</artifactId>
<version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
+
<artifactId>org.apache.karaf.jaas.spring-security-crypto</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: JAAS :: Spring Security Crypto Encryption</name>
<description>This bundle provide Spring Security Crypto service for the
encryption support in the JAAS security framework.</description>
-
+
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
</properties>
@@ -48,17 +48,17 @@
</dependency>
</dependencies>
</dependencyManagement>
-
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
- <artifactId>org.apache.karaf.jaas.modules</artifactId>
+ <artifactId>org.apache.karaf.jaas.modules</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 042e614872..502aa3fdf1 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -53,18 +53,15 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</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.jdbc</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
diff --git a/jms/pom.xml b/jms/pom.xml
index 2402c00f93..47e65f1e5e 100644
--- a/jms/pom.xml
+++ b/jms/pom.xml
@@ -53,13 +53,11 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.jms</groupId>
diff --git a/jndi/pom.xml b/jndi/pom.xml
index bc79553e6e..a3f7650829 100644
--- a/jndi/pom.xml
+++ b/jndi/pom.xml
@@ -57,7 +57,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
diff --git a/kar/pom.xml b/kar/pom.xml
index 50fe3de186..46be380181 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -53,13 +53,11 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
diff --git a/log/pom.xml b/log/pom.xml
index a0206f995f..7b83da3953 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -53,8 +53,11 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<dependency>
diff --git a/main/pom.xml b/main/pom.xml
index 6112db518a..664b3d0f61 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -53,8 +53,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
diff --git a/management/server/pom.xml b/management/server/pom.xml
index 94595b1b32..a3bf48587b 100644
--- a/management/server/pom.xml
+++ b/management/server/pom.xml
@@ -53,18 +53,19 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</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.event</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<dependency>
diff --git a/maven/core/pom.xml b/maven/core/pom.xml
index 70b4c2d4f4..0cd3b501d8 100644
--- a/maven/core/pom.xml
+++ b/maven/core/pom.xml
@@ -49,7 +49,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/obr/pom.xml b/obr/pom.xml
index 91911efdb6..f92caba1f0 100644
--- a/obr/pom.xml
+++ b/obr/pom.xml
@@ -53,8 +53,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/package/pom.xml b/package/pom.xml
index 4ba91b23be..643344da29 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -60,8 +60,11 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.resource</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/pom.xml b/pom.xml
index a9467af8d8..98970606ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -290,20 +290,35 @@
<maven.resolver.version>1.8.2</maven.resolver.version>
<osgi.version>8.0.0</osgi.version>
+
<org.osgi.annotation.bundle.version>1.1.0</org.osgi.annotation.bundle.version>
<org.osgi.annotation.versioning.version>1.1.2</org.osgi.annotation.versioning.version>
+ <org.osgi.dto.version>1.1.1</org.osgi.dto.version>
+ <org.osgi.framework.version>1.10.0</org.osgi.framework.version>
+
<org.osgi.namespace.service.version>1.0.0</org.osgi.namespace.service.version>
+ <org.osgi.resource.version>1.0.1</org.osgi.resource.version>
<org.osgi.service.cm.version>1.6.1</org.osgi.service.cm.version>
<org.osgi.service.component.version>1.5.1</org.osgi.service.component.version>
<org.osgi.service.component.annotations.version>1.5.1</org.osgi.service.component.annotations.version>
+
<org.osgi.service.condition.version>1.0.0</org.osgi.service.condition.version>
+
<org.osgi.service.condpermadmin.version>1.1.2</org.osgi.service.condpermadmin.version>
<org.osgi.service.event.version>1.4.1</org.osgi.service.event.version>
<org.osgi.service.http.version>1.2.2</org.osgi.service.http.version>
<org.osgi.service.jdbc.version>1.1.0</org.osgi.service.jdbc.version>
<org.osgi.service.jpa.version>1.0.0</org.osgi.service.jpa.version>
<org.osgi.service.log.version>1.5.0</org.osgi.service.log.version>
<org.osgi.service.metatype.version>1.4.1</org.osgi.service.metatype.version>
-
<org.osgi.service.namespace.version>1.0.0</org.osgi.service.namespace.version>
+
<org.osgi.service.metatype.annotations.version>1.4.1</org.osgi.service.metatype.annotations.version>
+
<org.osgi.service.packageadmin.version>1.2.1</org.osgi.service.packageadmin.version>
+
<org.osgi.service.permissionadmin.version>1.2.1</org.osgi.service.permissionadmin.version>
<org.osgi.service.repository.version>1.1.0</org.osgi.service.repository.version>
+
<org.osgi.service.resolver.version>1.1.1</org.osgi.service.resolver.version>
+
<org.osgi.service.startlevel.version>1.1.1</org.osgi.service.startlevel.version>
+
<org.osgi.service.subsystem.version>1.1.0</org.osgi.service.subsystem.version>
+ <org.osgi.service.url.version>1.0.1</org.osgi.service.url.version>
+
<org.osgi.util.converter.version>1.0.9</org.osgi.util.converter.version>
<org.osgi.util.function.version>1.2.0</org.osgi.util.function.version>
<org.osgi.util.promise.version>1.3.0</org.osgi.util.promise.version>
+ <org.osgi.util.tracker.version>1.5.4</org.osgi.util.tracker.version>
<pax.cdi.version>1.1.4</pax.cdi.version>
<pax.exam.version>4.13.5</pax.exam.version>
diff --git a/profile/pom.xml b/profile/pom.xml
index 8d86a918fe..5b5cd3f5d3 100644
--- a/profile/pom.xml
+++ b/profile/pom.xml
@@ -54,13 +54,15 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.resource</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
diff --git a/scheduler/pom.xml b/scheduler/pom.xml
index 3e49b0b34d..360b67ee09 100644
--- a/scheduler/pom.xml
+++ b/scheduler/pom.xml
@@ -109,13 +109,15 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/scr/management/pom.xml b/scr/management/pom.xml
index eb5d343556..a721edd791 100644
--- a/scr/management/pom.xml
+++ b/scr/management/pom.xml
@@ -57,18 +57,19 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.dto</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<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>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/scr/state/pom.xml b/scr/state/pom.xml
index 352a44e4d8..628872448e 100644
--- a/scr/state/pom.xml
+++ b/scr/state/pom.xml
@@ -53,8 +53,15 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -70,16 +77,6 @@
<groupId>org.apache.karaf.bundle</groupId>
<artifactId>org.apache.karaf.bundle.core</artifactId>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <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>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
diff --git a/service/core/pom.xml b/service/core/pom.xml
index fdf389a57f..b1b77af8fd 100644
--- a/service/core/pom.xml
+++ b/service/core/pom.xml
@@ -52,8 +52,11 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
diff --git a/service/guard/pom.xml b/service/guard/pom.xml
index d9cad0031e..0cea42cf2c 100644
--- a/service/guard/pom.xml
+++ b/service/guard/pom.xml
@@ -67,13 +67,19 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.resource</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/services/coordinator/pom.xml b/services/coordinator/pom.xml
index 7f932a9a45..07828232a3 100644
--- a/services/coordinator/pom.xml
+++ b/services/coordinator/pom.xml
@@ -47,11 +47,6 @@
</dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.coordinator</artifactId>
diff --git a/services/eventadmin/pom.xml b/services/eventadmin/pom.xml
index 2d3316a2d5..9d24eaba2d 100644
--- a/services/eventadmin/pom.xml
+++ b/services/eventadmin/pom.xml
@@ -108,18 +108,19 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</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>org.osgi.util.tracker</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/services/interceptor/impl/pom.xml
b/services/interceptor/impl/pom.xml
index 47afb50776..7e997e3410 100644
--- a/services/interceptor/impl/pom.xml
+++ b/services/interceptor/impl/pom.xml
@@ -53,8 +53,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
diff --git a/services/staticcm/pom.xml b/services/staticcm/pom.xml
index 7467851433..cb6cd94dde 100644
--- a/services/staticcm/pom.xml
+++ b/services/staticcm/pom.xml
@@ -90,14 +90,15 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
- <version>1.6.0</version>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/shell/commands/pom.xml b/shell/commands/pom.xml
index b6bf68e11e..6fbf791d35 100644
--- a/shell/commands/pom.xml
+++ b/shell/commands/pom.xml
@@ -65,8 +65,11 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/shell/console/pom.xml b/shell/console/pom.xml
index 57db3ba09d..2542b836a6 100644
--- a/shell/console/pom.xml
+++ b/shell/console/pom.xml
@@ -52,13 +52,19 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</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.packageadmin</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<dependency>
diff --git a/shell/core/pom.xml b/shell/core/pom.xml
index dcdea0a1c8..6fee20f8e8 100644
--- a/shell/core/pom.xml
+++ b/shell/core/pom.xml
@@ -61,18 +61,23 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.resource</artifactId>
</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.event</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml
index 58c20f67ab..f24c823231 100644
--- a/shell/ssh/pom.xml
+++ b/shell/ssh/pom.xml
@@ -63,13 +63,15 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<dependency>
diff --git a/specs/activator/pom.xml b/specs/activator/pom.xml
index 2cc18cd0df..3ff339a307 100644
--- a/specs/activator/pom.xml
+++ b/specs/activator/pom.xml
@@ -49,8 +49,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
</dependencies>
diff --git a/specs/locator/pom.xml b/specs/locator/pom.xml
index a9bf54ed39..329ecaac54 100644
--- a/specs/locator/pom.xml
+++ b/specs/locator/pom.xml
@@ -30,24 +30,4 @@
<artifactId>org.apache.karaf.specs.locator</artifactId>
<name>Apache Karaf :: Specs :: Locator</name>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>karaf-bom</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
</project>
diff --git a/subsystem/pom.xml b/subsystem/pom.xml
index f0c05968b5..76ccd353ed 100644
--- a/subsystem/pom.xml
+++ b/subsystem/pom.xml
@@ -52,8 +52,11 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.subsystem</artifactId>
</dependency>
<dependency>
diff --git a/system/pom.xml b/system/pom.xml
index 89f5d2c99d..6f3db23f6e 100644
--- a/system/pom.xml
+++ b/system/pom.xml
@@ -55,8 +55,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/util/pom.xml b/util/pom.xml
index e030c13830..fc7bdf50be 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -18,16 +18,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
<version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
+
<artifactId>org.apache.karaf.util</artifactId>
<packaging>jar</packaging>
<name>Apache Karaf :: Util</name>
@@ -48,13 +48,15 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -75,7 +77,7 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<properties>
<appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
</properties>
diff --git a/web/pom.xml b/web/pom.xml
index ab46f8eb82..1d3b06eee4 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -55,8 +55,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
diff --git a/webconsole/console/pom.xml b/webconsole/console/pom.xml
index 91ade5a38e..e25f8c6dde 100644
--- a/webconsole/console/pom.xml
+++ b/webconsole/console/pom.xml
@@ -20,7 +20,7 @@
-->
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>webconsole</artifactId>
@@ -56,7 +56,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -66,6 +66,10 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.http</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.util</artifactId>
@@ -183,7 +187,7 @@
org.apache.felix.framework;inline=org/apache/felix/framework/util/VersionRange**,
<!-- ServiceTracker -->
- osgi.core;inline=org/osgi/util/tracker/*,
+ org.osgi.util.tracker;inline=**,
<!-- File Upload -->
commons-fileupload,
diff --git a/webconsole/features/pom.xml b/webconsole/features/pom.xml
index b2e1fa311f..7e82825d0c 100644
--- a/webconsole/features/pom.xml
+++ b/webconsole/features/pom.xml
@@ -52,8 +52,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/webconsole/gogo/pom.xml b/webconsole/gogo/pom.xml
index ba0b1b1e99..b8de8d11a6 100644
--- a/webconsole/gogo/pom.xml
+++ b/webconsole/gogo/pom.xml
@@ -52,8 +52,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
diff --git a/webconsole/http/pom.xml b/webconsole/http/pom.xml
index b80553ba00..14b454f8b1 100644
--- a/webconsole/http/pom.xml
+++ b/webconsole/http/pom.xml
@@ -52,8 +52,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/webconsole/instance/pom.xml b/webconsole/instance/pom.xml
index 623b848c04..bfcd47f569 100644
--- a/webconsole/instance/pom.xml
+++ b/webconsole/instance/pom.xml
@@ -57,8 +57,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/wrapper/pom.xml b/wrapper/pom.xml
index ecae42c3d5..f1f7050029 100644
--- a/wrapper/pom.xml
+++ b/wrapper/pom.xml
@@ -56,7 +56,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
