This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new 1eccfe3 [KARAF-7129] Add RequireService(ConfigurationAdmin.class) on
SSH Activator to track configadmin service
1eccfe3 is described below
commit 1eccfe34819b7d88d25d7b60c8fa7c92f8edab10
Author: jbonofre <[email protected]>
AuthorDate: Tue May 4 06:18:12 2021 +0200
[KARAF-7129] Add RequireService(ConfigurationAdmin.class) on SSH Activator
to track configadmin service
(cherry picked from commit 8c2d5f928b3ddd3b9786e9a6b0b37a38dddaf974)
---
shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java
b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java
index a67f371..f7ee5f1 100644
--- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java
+++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java
@@ -40,6 +40,7 @@ import
org.apache.sshd.server.forward.AcceptAllForwardingFilter;
import org.apache.sshd.server.scp.ScpCommandFactory;
import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.cm.ManagedService;
import org.osgi.util.tracker.ServiceTracker;
import org.slf4j.Logger;
@@ -49,7 +50,7 @@ import org.slf4j.LoggerFactory;
* Activate this bundle
*/
@Services(
- requires = @RequireService(SessionFactory.class)
+ requires = { @RequireService(SessionFactory.class),
@RequireService(ConfigurationAdmin.class) }
)
@Managed("org.apache.karaf.shell")
public class Activator extends BaseActivator implements ManagedService {
