This is an automated email from the ASF dual-hosted git repository.
mbaedke pushed a commit to branch OAK-12305
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/OAK-12305 by this push:
new 827fbd309f OAK-12305: Update OSGi-related dependencies of oak-pojosr
827fbd309f is described below
commit 827fbd309f856106704eac194c1d915f4409cfe9
Author: Manfred Baedke <[email protected]>
AuthorDate: Wed Jul 8 14:03:22 2026 +0200
OAK-12305: Update OSGi-related dependencies of oak-pojosr
done
---
oak-parent/pom.xml | 5 +++++
oak-pojosr/pom.xml | 52 +++++++++++++++++-----------------------------------
2 files changed, 22 insertions(+), 35 deletions(-)
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index c266b80cf3..0e4879ef39 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -524,6 +524,11 @@
<artifactId>org.osgi.service.event</artifactId>
<version>1.4.1</version>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.promise</artifactId>
+ <version>1.1.1</version>
+ </dependency>
<!-- OSGi R7 annotations -->
<dependency>
<groupId>org.osgi</groupId>
diff --git a/oak-pojosr/pom.xml b/oak-pojosr/pom.xml
index 761c3c23e1..09466dc23b 100644
--- a/oak-pojosr/pom.xml
+++ b/oak-pojosr/pom.xml
@@ -57,35 +57,28 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.promise</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Pojo SR -->
- <!-- Added first to ensure that in an IDE the transitive dependencies of
the oak modules
- don't bring in an older version of the OSGi jars -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.connect</artifactId>
<version>0.2.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- </exclusions>
</dependency>
-
+
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
@@ -124,23 +117,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
- <version>2.0.12</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-annotations</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.dto</artifactId>
- <version>1.0.0</version>
+ <version>2.2.14</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.8.16</version>
+ <version>1.9.26</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -150,7 +132,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
- <version>1.0.12</version>
+ <version>1.2.4</version>
<exclusions>
<exclusion>
<groupId>net.sf.kxml</groupId>
@@ -165,7 +147,7 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.whiteboard</artifactId>
- <version>1.0.0</version>
+ <version>1.2.0</version>
</dependency>
