(aries-rsa) branch master updated: ARIES-2033 Fix Zookeeper discovery missing service capability

[amichai]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 09cf7aa5 ARIES-2033 Fix Zookeeper discovery missing service capability
09cf7aa5 is described below

commit 09cf7aa54b6f333daa1caa0bc9d373e27259c114
Author: Amichai Rothman <amic...@apache.org>
AuthorDate: Mon Jun 3 00:59:00 2024 +0300

    ARIES-2033 Fix Zookeeper discovery missing service capability
---
 .../apache/aries/rsa/discovery/zookeeper/client/ClientManager.java  | 6 ++++++
 .../apache/aries/rsa/discovery/zookeeper/client/package-info.java   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git 
a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ClientManager.java
 
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ClientManager.java
index b3aaad04..ec5cc16e 100644
--- 
a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ClientManager.java
+++ 
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ClientManager.java
@@ -28,8 +28,10 @@ import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.Watcher.Event.KeeperState;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.server.ZooTrace;
+import org.osgi.annotation.bundle.Capability;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
+import org.osgi.namespace.service.ServiceNamespace;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.ConfigurationPolicy;
@@ -48,6 +50,10 @@ import org.slf4j.LoggerFactory;
         configurationPid = ClientManager.DISCOVERY_ZOOKEEPER_ID, //
         configurationPolicy = ConfigurationPolicy.REQUIRE //
 )
+@Capability( // add Provide-Capability to manifest that matches auto-generated 
Require-Capability
+        namespace = ServiceNamespace.SERVICE_NAMESPACE,
+        effective = "active",
+        attribute = "objectClass=org.apache.zookeeper.ZooKeeper")
 public class ClientManager implements Watcher {
     public static final String DISCOVERY_ZOOKEEPER_ID = 
"org.apache.aries.rsa.discovery.zookeeper";
     private static final Logger LOG = 
LoggerFactory.getLogger(ClientManager.class);
diff --git 
a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/package-info.java
 
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/package-info.java
index 1104a44a..ba8e6882 100644
--- 
a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/package-info.java
+++ 
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/package-info.java
@@ -17,5 +17,5 @@
  * under the License.
  */
 @org.osgi.annotation.bundle.Export
-@org.osgi.annotation.versioning.Version("1.0.0")
+@org.osgi.annotation.versioning.Version("2.0.0")
 package org.apache.aries.rsa.discovery.zookeeper.client;