You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by am...@apache.org on 2026/05/25 12:07:54 UTC

(aries-rsa) branch master updated (ce2d46b7 -> 136ff604)

This is an automated email from the ASF dual-hosted git repository.

amichair pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git


    from ce2d46b7 Improve event logging
     new 052eddb5 ARIES-2221 Upgrade to OSGi R8
     new 846d4053 Upgrade to pax-exam 4.14.0, hamcrest 2.2, awaitility 4.3.0
     new ba7951d9 ARIES-2222 Migrate ZooKeeper from discontinued servicemix bundles to embedded in discovery bundle
     new 136ff604 ARIES-2223 Upgrade ZooKeeper to 3.9.5

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 discovery/command/pom.xml                          |   6 +
 discovery/config/pom.xml                           |   5 +
 discovery/local/pom.xml                            |   6 +
 discovery/mdns/pom.xml                             |   2 +
 discovery/tcp/pom.xml                              |  11 +-
 discovery/zookeeper/bnd.bnd                        |  22 ++-
 discovery/zookeeper/pom.xml                        | 100 +++++++++-----
 examples/echofastbin/fbconsumer/pom.xml            |   5 +
 examples/echofastbin/fbservice/pom.xml             |   5 +
 examples/echofastbin/pom.xml                       |   7 +-
 examples/echotcp/consumer/pom.xml                  |   5 +
 examples/echotcp/pom.xml                           |   7 +-
 examples/echotcp/service/pom.xml                   |   9 ++
 features/src/main/resources/features.xml           |   1 -
 itests/felix/pom.xml                               |  17 ++-
 .../apache/aries/rsa/itests/felix/RsaTestBase.java |  25 ++--
 itests/pom.xml                                     |  13 ++
 itests/tck/pom.xml                                 |   5 +-
 parent/pom.xml                                     | 153 +++++++++++----------
 provider/fastbin/pom.xml                           |  18 ++-
 provider/tcp/pom.xml                               |   5 +
 rsa/pom.xml                                        |   5 +
 topology-manager/pom.xml                           |   5 +
 23 files changed, 286 insertions(+), 151 deletions(-)


(aries-rsa) 04/04: ARIES-2223 Upgrade ZooKeeper to 3.9.5

Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

amichair pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git

commit 136ff6041b0ff5a562d5c37bb3aa2c9bc9b50c2c
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Tue May 19 13:01:06 2026 +0300

    ARIES-2223 Upgrade ZooKeeper to 3.9.5
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 4f348172..21bf66da 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -34,7 +34,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <bnd.version>7.2.3</bnd.version>
-        <zookeeper.version>3.9.3</zookeeper.version>
+        <zookeeper.version>3.9.5</zookeeper.version>
         <netty.version>4.1.121.Final</netty.version>
         <slf4j.version>2.0.18</slf4j.version>
         <logback.version>1.5.32</logback.version>


(aries-rsa) 03/04: ARIES-2222 Migrate ZooKeeper from discontinued servicemix bundles to embedded in discovery bundle

Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

amichair pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git

commit ba7951d9afa8e0811bca1dc19caa6080369e0654
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Tue May 19 13:00:34 2026 +0300

    ARIES-2222 Migrate ZooKeeper from discontinued servicemix bundles to embedded in discovery bundle
---
 discovery/zookeeper/bnd.bnd                        | 22 ++++++-
 discovery/zookeeper/pom.xml                        | 76 +++++++++++++---------
 features/src/main/resources/features.xml           |  1 -
 itests/felix/pom.xml                               |  6 --
 .../apache/aries/rsa/itests/felix/RsaTestBase.java |  1 -
 parent/pom.xml                                     | 41 +++---------
 6 files changed, 72 insertions(+), 75 deletions(-)

diff --git a/discovery/zookeeper/bnd.bnd b/discovery/zookeeper/bnd.bnd
index e8cf8f7c..31b7bca1 100644
--- a/discovery/zookeeper/bnd.bnd
+++ b/discovery/zookeeper/bnd.bnd
@@ -15,6 +15,24 @@
 #    KIND, either express or implied.  See the License for the
 #    specific language governing permissions and limitations
 #    under the License.
+
+-split-package:=merge-first
+-fixupmessages: "Split package*";is:=ignore
+
+Export-Package: \
+    org.apache.aries.rsa.discovery.zookeeper*,\
+    org.apache.zookeeper*;version="${zookeeper.version}",\
+    org.apache.jute*;version="${zookeeper.version}"
+
 Import-Package: \
-  org.apache.zookeeper.metrics.impl;resolution:=optional,\
-  *
+    !com.fasterxml.jackson.*,\
+    io.netty.channel.epoll.*;resolution:=optional,\
+    io.netty.channel.kqueue.*;resolution:=optional,\
+    io.netty.incubator.*;resolution:=optional,\
+    io.netty.internal.tcnative.*;resolution:=optional,\
+    io.netty.*,\
+    org.slf4j.*,\
+    org.osgi.*,\
+    javax.security.*,\
+    org.apache.aries.rsa.*,\
+    *;resolution:=optional
diff --git a/discovery/zookeeper/pom.xml b/discovery/zookeeper/pom.xml
index 93674ef5..43e144f9 100644
--- a/discovery/zookeeper/pom.xml
+++ b/discovery/zookeeper/pom.xml
@@ -61,38 +61,12 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.zookeeper</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.sun.jdmk</groupId>
-                    <artifactId>jmxtools</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.sun.jmx</groupId>
-                    <artifactId>jmxri</artifactId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>slf4j-log4j12</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jline</artifactId>
-                    <groupId>jline</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>netty</artifactId>
-                    <groupId>io.netty</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>log4j</artifactId>
-                    <groupId>log4j</groupId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.netty</groupId>
-                    <artifactId>netty</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper-jute</artifactId>
         </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
@@ -121,4 +95,42 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <!--
+                ZooKeeper artifacts have no OSGi support, and the two inter-dependent bundles
+                (zookeeper and zookeeper-jute) make them difficult to just wrap, so we embed
+                them into our discovery bundle
+            -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-zookeeper</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.zookeeper</groupId>
+                                    <artifactId>zookeeper</artifactId>
+                                    <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.zookeeper</groupId>
+                                    <artifactId>zookeeper-jute</artifactId>
+                                    <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                            <excludes>META-INF/**</excludes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 3c98c196..be425d12 100644
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -57,7 +57,6 @@
 
     <feature name="aries-rsa-discovery-zookeeper" version="${project.version}">
         <feature>aries-rsa-core</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.zookeeper/${zookeeper.version}</bundle>
         <bundle>mvn:org.apache.aries.rsa.discovery/org.apache.aries.rsa.discovery.local/${project.version}</bundle>
         <bundle>mvn:org.apache.aries.rsa.discovery/org.apache.aries.rsa.discovery.zookeeper/${project.version}</bundle>
 
diff --git a/itests/felix/pom.xml b/itests/felix/pom.xml
index 7f79beef..0ce86448 100644
--- a/itests/felix/pom.xml
+++ b/itests/felix/pom.xml
@@ -282,12 +282,6 @@
             <classifier>uber</classifier>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.zookeeper</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
index 3b243654..16953767 100644
--- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
+++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
@@ -179,7 +179,6 @@ public class RsaTestBase {
                          mvn("io.netty", "netty-codec"),
                          mvn("io.dropwizard.metrics", "metrics-core"),
                          mvn("org.xerial.snappy", "snappy-java"),
-                         mvn("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.zookeeper"),
                          mvn("org.apache.aries.rsa.discovery", "org.apache.aries.rsa.discovery.zookeeper"));
     }
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 6cc7eb33..4f348172 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -34,7 +34,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <bnd.version>7.2.3</bnd.version>
-        <zookeeper.version>3.9.3_1</zookeeper.version>
+        <zookeeper.version>3.9.3</zookeeper.version>
         <netty.version>4.1.121.Final</netty.version>
         <slf4j.version>2.0.18</slf4j.version>
         <logback.version>1.5.32</logback.version>
@@ -242,39 +242,14 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.zookeeper</artifactId>
+                <groupId>org.apache.zookeeper</groupId>
+                <artifactId>zookeeper</artifactId>
+                <version>${zookeeper.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.zookeeper</groupId>
+                <artifactId>zookeeper-jute</artifactId>
                 <version>${zookeeper.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.sun.jdmk</groupId>
-                        <artifactId>jmxtools</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.sun.jmx</groupId>
-                        <artifactId>jmxri</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <artifactId>slf4j-log4j12</artifactId>
-                        <groupId>org.slf4j</groupId>
-                    </exclusion>
-                    <exclusion>
-                        <artifactId>jline</artifactId>
-                        <groupId>jline</groupId>
-                    </exclusion>
-                    <exclusion>
-                        <artifactId>netty</artifactId>
-                        <groupId>io.netty</groupId>
-                    </exclusion>
-                    <exclusion>
-                        <artifactId>log4j</artifactId>
-                        <groupId>log4j</groupId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>io.netty</groupId>
-                        <artifactId>netty</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
             <dependency>
                 <groupId>io.dropwizard.metrics</groupId>


(aries-rsa) 01/04: ARIES-2221 Upgrade to OSGi R8

Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

amichair pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git

commit 052eddb545508b724e1d8a6802da88a7baab6c07
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Mon May 18 23:58:10 2026 +0300

    ARIES-2221 Upgrade to OSGi R8
---
 discovery/command/pom.xml               |  6 +++
 discovery/config/pom.xml                |  5 ++
 discovery/local/pom.xml                 |  6 +++
 discovery/mdns/pom.xml                  |  2 +
 discovery/tcp/pom.xml                   | 11 ++--
 discovery/zookeeper/pom.xml             | 18 +++++++
 examples/echofastbin/fbconsumer/pom.xml |  5 ++
 examples/echofastbin/fbservice/pom.xml  |  5 ++
 examples/echofastbin/pom.xml            |  7 +--
 examples/echotcp/consumer/pom.xml       |  5 ++
 examples/echotcp/pom.xml                |  7 +--
 examples/echotcp/service/pom.xml        |  9 ++++
 itests/felix/pom.xml                    |  2 -
 itests/tck/pom.xml                      |  5 +-
 parent/pom.xml                          | 92 +++++++++++++++++++++++----------
 provider/fastbin/pom.xml                | 18 ++++---
 provider/tcp/pom.xml                    |  5 ++
 rsa/pom.xml                             |  5 ++
 topology-manager/pom.xml                |  5 ++
 19 files changed, 165 insertions(+), 53 deletions(-)

diff --git a/discovery/command/pom.xml b/discovery/command/pom.xml
index e85b899c..497439f4 100644
--- a/discovery/command/pom.xml
+++ b/discovery/command/pom.xml
@@ -43,6 +43,12 @@
             <artifactId>org.apache.aries.rsa.spi</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.core</artifactId>
diff --git a/discovery/config/pom.xml b/discovery/config/pom.xml
index fdd2e133..9ded8eab 100644
--- a/discovery/config/pom.xml
+++ b/discovery/config/pom.xml
@@ -41,6 +41,11 @@
             <artifactId>org.apache.aries.rsa.spi</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.cm</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/discovery/local/pom.xml b/discovery/local/pom.xml
index b6100de5..d6acf284 100644
--- a/discovery/local/pom.xml
+++ b/discovery/local/pom.xml
@@ -44,6 +44,12 @@
             <artifactId>org.apache.aries.rsa.spi</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>xmlunit</groupId>
             <artifactId>xmlunit</artifactId>
diff --git a/discovery/mdns/pom.xml b/discovery/mdns/pom.xml
index 4791cf77..e1d069d2 100644
--- a/discovery/mdns/pom.xml
+++ b/discovery/mdns/pom.xml
@@ -21,6 +21,7 @@
             <artifactId>org.apache.aries.rsa.spi</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.component.annotations</artifactId>
@@ -30,6 +31,7 @@
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.jaxrs</artifactId>
         </dependency>
+
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
diff --git a/discovery/tcp/pom.xml b/discovery/tcp/pom.xml
index bb08cdcd..13d15304 100644
--- a/discovery/tcp/pom.xml
+++ b/discovery/tcp/pom.xml
@@ -46,14 +46,19 @@
         </dependency>
 
         <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.remoteserviceadmin</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/discovery/zookeeper/pom.xml b/discovery/zookeeper/pom.xml
index ad44a358..eb4ce083 100644
--- a/discovery/zookeeper/pom.xml
+++ b/discovery/zookeeper/pom.xml
@@ -42,6 +42,24 @@
             <artifactId>org.apache.aries.rsa.spi</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.namespace.service</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.cm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.metatype.annotations</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.zookeeper</artifactId>
diff --git a/examples/echofastbin/fbconsumer/pom.xml b/examples/echofastbin/fbconsumer/pom.xml
index 6d53a2ae..ec8fcc31 100644
--- a/examples/echofastbin/fbconsumer/pom.xml
+++ b/examples/echofastbin/fbconsumer/pom.xml
@@ -35,5 +35,10 @@
             <artifactId>org.apache.aries.rsa.examples.echofastbin.fbapi</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/examples/echofastbin/fbservice/pom.xml b/examples/echofastbin/fbservice/pom.xml
index 27f58109..c7a867f8 100644
--- a/examples/echofastbin/fbservice/pom.xml
+++ b/examples/echofastbin/fbservice/pom.xml
@@ -35,5 +35,10 @@
             <artifactId>org.apache.aries.rsa.examples.echofastbin.fbapi</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/examples/echofastbin/pom.xml b/examples/echofastbin/pom.xml
index c5583257..2e33cb67 100644
--- a/examples/echofastbin/pom.xml
+++ b/examples/echofastbin/pom.xml
@@ -29,12 +29,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
+            <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/examples/echotcp/consumer/pom.xml b/examples/echotcp/consumer/pom.xml
index d6bac448..9817408f 100644
--- a/examples/echotcp/consumer/pom.xml
+++ b/examples/echotcp/consumer/pom.xml
@@ -35,5 +35,10 @@
             <artifactId>org.apache.aries.rsa.examples.echotcp.api</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/examples/echotcp/pom.xml b/examples/echotcp/pom.xml
index aba385a0..c72b6158 100644
--- a/examples/echotcp/pom.xml
+++ b/examples/echotcp/pom.xml
@@ -37,12 +37,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
+            <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/examples/echotcp/service/pom.xml b/examples/echotcp/service/pom.xml
index fdbef507..4a2d5d06 100644
--- a/examples/echotcp/service/pom.xml
+++ b/examples/echotcp/service/pom.xml
@@ -35,5 +35,14 @@
             <artifactId>org.apache.aries.rsa.examples.echotcp.api</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.cm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/itests/felix/pom.xml b/itests/felix/pom.xml
index 9ffbb311..d2012279 100644
--- a/itests/felix/pom.xml
+++ b/itests/felix/pom.xml
@@ -58,7 +58,6 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.util.function</artifactId>
-            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -67,7 +66,6 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.component</artifactId>
-            <version>1.5.1</version>
         </dependency>
 
         <dependency>
diff --git a/itests/tck/pom.xml b/itests/tck/pom.xml
index b29cecbb..2cdd19ae 100644
--- a/itests/tck/pom.xml
+++ b/itests/tck/pom.xml
@@ -129,16 +129,17 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.util.function</artifactId>
-            <version>1.2.0</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.util.promise</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.component</artifactId>
-            <version>1.5.1</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index a085f10b..12ac546c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -47,12 +47,12 @@
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
+            <artifactId>org.osgi.service.remoteserviceadmin</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -60,6 +60,7 @@
             <artifactId>osgi.annotation</artifactId>
             <version>8.1.0</version>
         </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -116,16 +117,73 @@
 
     <dependencyManagement>
         <dependencies>
+            <!-- OSGi -->
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>osgi.core</artifactId>
+                <version>8.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.event</artifactId>
+                <version>1.4.1</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.cm</artifactId>
+                <version>1.6.1</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.remoteserviceadmin</artifactId>
+                <version>1.1.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.util.promise</artifactId>
+                <version>1.3.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.util.function</artifactId>
+                <version>1.2.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.component</artifactId>
+                <version>1.5.1</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.component.annotations</artifactId>
+                <version>1.5.1</version>
+                <scope>provided</scope>
+            </dependency>
             <dependency>
                 <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.core</artifactId>
-                <version>6.0.0</version>
+                <artifactId>org.osgi.namespace.service</artifactId>
+                <version>1.0.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.metatype.annotations</artifactId>
+                <version>1.4.1</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.osgi</groupId>
-                <artifactId>osgi.cmpn</artifactId>
-                <version>7.0.0</version>
+                <artifactId>org.osgi.service.jaxrs</artifactId>
+                <version>1.0.1</version>
+                <scope>provided</scope>
             </dependency>
+
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
@@ -260,28 +318,6 @@
                 <version>2.1.4</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.service.remoteserviceadmin</artifactId>
-                <version>1.1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.util.promise</artifactId>
-                <version>1.3.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.service.component.annotations</artifactId>
-                <version>1.5.1</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.service.jaxrs</artifactId>
-                <version>1.0.1</version>
-            </dependency>
             <dependency>
                 <groupId>jakarta.ws.rs</groupId>
                 <artifactId>jakarta.ws.rs-api</artifactId>
diff --git a/provider/fastbin/pom.xml b/provider/fastbin/pom.xml
index dbcf8658..ad2093dd 100644
--- a/provider/fastbin/pom.xml
+++ b/provider/fastbin/pom.xml
@@ -42,6 +42,18 @@
             <artifactId>org.apache.aries.rsa.spi</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.cm</artifactId>
+        </dependency>
+        <!-- this is only needed if you want to use the Promise for remote services -->
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.util.promise</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>org.fusesource.hawtdispatch</groupId>
             <artifactId>hawtdispatch</artifactId>
@@ -56,12 +68,6 @@
             <artifactId>hawtbuf-proto</artifactId>
             <optional>true</optional>
         </dependency>
-        <!-- this is only needed if you want to use the Promise for remote services -->
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.util.promise</artifactId>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/provider/tcp/pom.xml b/provider/tcp/pom.xml
index 2d8ef252..d2ed8433 100644
--- a/provider/tcp/pom.xml
+++ b/provider/tcp/pom.xml
@@ -42,6 +42,11 @@
             <artifactId>org.apache.aries.rsa.spi</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.util.promise</artifactId>
diff --git a/rsa/pom.xml b/rsa/pom.xml
index 7485c685..6a06b539 100644
--- a/rsa/pom.xml
+++ b/rsa/pom.xml
@@ -40,6 +40,11 @@
             <artifactId>org.apache.aries.rsa.spi</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.event</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/topology-manager/pom.xml b/topology-manager/pom.xml
index b07bf6c7..3b3f6e83 100644
--- a/topology-manager/pom.xml
+++ b/topology-manager/pom.xml
@@ -43,6 +43,11 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.cm</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.shazam</groupId>
             <artifactId>shazamcrest</artifactId>


(aries-rsa) 02/04: Upgrade to pax-exam 4.14.0, hamcrest 2.2, awaitility 4.3.0

Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

amichair pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git

commit 846d40538f102986ef0512f51a049765d93acb79
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Tue May 19 08:53:14 2026 +0300

    Upgrade to pax-exam 4.14.0, hamcrest 2.2, awaitility 4.3.0
---
 discovery/zookeeper/pom.xml                        |  6 +-----
 itests/felix/pom.xml                               | 17 +++++++++++++++
 .../apache/aries/rsa/itests/felix/RsaTestBase.java | 24 +++++++++++++---------
 itests/pom.xml                                     | 13 ++++++++++++
 parent/pom.xml                                     | 20 ++++++++----------
 5 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/discovery/zookeeper/pom.xml b/discovery/zookeeper/pom.xml
index eb4ce083..93674ef5 100644
--- a/discovery/zookeeper/pom.xml
+++ b/discovery/zookeeper/pom.xml
@@ -113,11 +113,7 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.converter</artifactId>
diff --git a/itests/felix/pom.xml b/itests/felix/pom.xml
index d2012279..7f79beef 100644
--- a/itests/felix/pom.xml
+++ b/itests/felix/pom.xml
@@ -265,6 +265,23 @@
             <version>7.0.5</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.framework</artifactId>
+            <version>1.10.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.url</groupId>
+            <artifactId>pax-url-wrap</artifactId>
+            <version>2.6.14</version>
+            <classifier>uber</classifier>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
index 09af4933..3b243654 100644
--- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
+++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
@@ -18,12 +18,12 @@
  */
 package org.apache.aries.rsa.itests.felix;
 
-import static org.ops4j.pax.exam.CoreOptions.bundle;
 import static org.ops4j.pax.exam.CoreOptions.composite;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 import static org.ops4j.pax.exam.CoreOptions.vmOption;
 import static org.ops4j.pax.exam.CoreOptions.when;
+import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
 import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
 
 import java.io.IOException;
@@ -33,6 +33,7 @@ import java.net.ServerSocket;
 import javax.inject.Inject;
 
 import org.ops4j.pax.exam.CoreOptions;
+import org.ops4j.pax.exam.MavenUtils;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
 import org.ops4j.pax.exam.options.OptionalCompositeOption;
@@ -108,17 +109,20 @@ public class RsaTestBase {
         );
     }
 
-    /**
-     * We create our own junit option to also provide hamcrest and Awaitility support
-     */
     protected static Option junit() {
-        // based on CoreOptions.junitBundles()
+        // we use a custom configuration and not CoreOptions.junitBundles
+        // because so hamcrest is not too old and not too new for awaitility
+        String junitVersion = MavenUtils.getArtifactVersion("junit", "junit");
+        String hamcrestVersion = MavenUtils.getArtifactVersion("org.hamcrest", "hamcrest");
         return composite(
-                systemProperty("pax.exam.invoker").value("junit"),
-                bundle("link:classpath:META-INF/links/org.ops4j.pax.tipi.junit.link"),
-                bundle("link:classpath:META-INF/links/org.ops4j.pax.exam.invoker.junit.link"),
-                mvn("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.hamcrest"),
-                mvn("org.awaitility", "awaitility"));
+            wrappedBundle(mavenBundle("junit", "junit", junitVersion)).instructions(
+                "Bundle-SymbolicName=junit",
+                "Export-Package=org.junit.*;version=" + junitVersion + ",junit.*;version=" + junitVersion,
+                "Import-Package=org.hamcrest;version=\"" + hamcrestVersion
+                    + "\",org.hamcrest.core;version=\"" + hamcrestVersion + "\""
+            ),
+            mvn("org.hamcrest", "hamcrest"),
+            mvn("org.awaitility", "awaitility"));
     }
 
     protected static Option rsaCore() {
diff --git a/itests/pom.xml b/itests/pom.xml
index e768310f..ac1d1c61 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -74,6 +74,19 @@
                 <artifactId>pax-exam-link-mvn</artifactId>
                 <version>${exam.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.ops4j.pax.tinybundles</groupId>
+                <artifactId>tinybundles</artifactId>
+                <version>4.0.1</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>biz.aQute.bndlib</artifactId>
+                <version>${bnd.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
 
     </dependencyManagement>
diff --git a/parent/pom.xml b/parent/pom.xml
index 12ac546c..6cc7eb33 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -40,7 +40,7 @@
         <logback.version>1.5.32</logback.version>
         <hawtdispatch.version>1.22</hawtdispatch.version>
         <hawtbuf.version>1.11</hawtbuf.version>
-        <exam.version>4.13.5</exam.version>
+        <exam.version>4.14.0</exam.version>
         <paxlogging.version>2.3.3</paxlogging.version>
     </properties>
 
@@ -100,18 +100,14 @@
             <exclusions>
                 <exclusion>
                     <groupId>org.hamcrest</groupId>
-                    <artifactId>hamcrest-library</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.hamcrest</groupId>
-                    <artifactId>hamcrest-core</artifactId>
+                    <artifactId>hamcrest</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.hamcrest</artifactId>
-            <version>1.3_1</version>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
@@ -229,8 +225,8 @@
             </dependency>
             <dependency>
                 <groupId>org.hamcrest</groupId>
-                <artifactId>hamcrest-all</artifactId>
-                <version>1.3</version>
+                <artifactId>hamcrest</artifactId>
+                <version>2.2</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -242,7 +238,7 @@
             <dependency>
                 <groupId>org.awaitility</groupId>
                 <artifactId>awaitility</artifactId>
-                <version>3.1.6</version>
+                <version>4.3.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>