[sling-org-apache-sling-discovery-oak] branch master updated: SLING-8354 Migrate to Felix HC API

[ghenzler]

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

ghenzler pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git


The following commit(s) were added to refs/heads/master by this push:
     new 75b2442  SLING-8354 Migrate to Felix HC API
75b2442 is described below

commit 75b24429c1e35c37db68fdd2e1c71b8da351dfc2
Author: georg.henzler <georg.henz...@netcentric.biz>
AuthorDate: Wed Aug 5 00:49:40 2020 +0200

    SLING-8354 Migrate to Felix HC API
---
 pom.xml                                                        | 10 ++++++----
 .../sling/discovery/oak/SynchronizedClocksHealthCheck.java     |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index f20c6b4..49d0643 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,9 @@
                   <instructions>
                     <Import-Package>
                       <!-- WebConsole support is optional -->
-                      org.apache.felix.webconsole;resolution:=optional,*
+                      org.apache.felix.webconsole;resolution:=optional,
+                      org.apache.felix.hc.api;resolution:=optional,
+                      *
                     </Import-Package>
                            <Embed-Dependency>
                              
commons-net;inline=org/apache/commons/net/util/SubnetUtils*
@@ -332,9 +334,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-               <groupId>org.apache.sling</groupId>
-               <artifactId>org.apache.sling.hc.core</artifactId>
-               <version>1.0.6</version>
+               <groupId>org.apache.felix</groupId>
+               <artifactId>org.apache.felix.healthcheck.api</artifactId>
+               <version>2.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
diff --git 
a/src/main/java/org/apache/sling/discovery/oak/SynchronizedClocksHealthCheck.java
 
b/src/main/java/org/apache/sling/discovery/oak/SynchronizedClocksHealthCheck.java
index 759327e..c5d60a2 100644
--- 
a/src/main/java/org/apache/sling/discovery/oak/SynchronizedClocksHealthCheck.java
+++ 
b/src/main/java/org/apache/sling/discovery/oak/SynchronizedClocksHealthCheck.java
@@ -33,9 +33,9 @@ import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
 import org.apache.sling.discovery.base.connectors.announcement.Announcement;
 import 
org.apache.sling.discovery.base.connectors.announcement.AnnouncementRegistry;
-import org.apache.sling.hc.api.HealthCheck;
-import org.apache.sling.hc.api.Result;
-import org.apache.sling.hc.util.FormattingResultLog;
+import org.apache.felix.hc.api.HealthCheck;
+import org.apache.felix.hc.api.Result;
+import org.apache.felix.hc.api.FormattingResultLog;
 import org.apache.sling.settings.SlingSettingsService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;