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 <[email protected]> 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>
