[sling-org-apache-sling-distribution-core] 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-distribution-core.git


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

commit e84a875062ecc17ed6d5711ef6e666c932dbe7ab
Author: georg.henzler <georg.henz...@netcentric.biz>
AuthorDate: Wed Aug 5 00:33:14 2020 +0200

    SLING-8354 Migrate to Felix HC API
---
 pom.xml                                                           | 7 ++++---
 .../sling/distribution/monitor/DistributionQueueHealthCheck.java  | 8 ++++----
 .../distribution/monitor/DistributionQueueHealthCheckTest.java    | 2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index a134cbc..03bb94c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,6 +87,7 @@
                         <Import-Package>
                             org.apache.http.nio.*;resolution:=optional,
                             
org.apache.http.impl.nio.client.*;resolution:=optional,
+                            org.apache.felix.hc.api;resolution:=optional,
                             org.apache.sling.event.jobs;version="[1.5.0,3.0)",
                             
org.apache.sling.event.jobs.consumer;version="[1.1,2)",
                             org.apache.sling.jcr.api;version="2.2.0",
@@ -263,9 +264,9 @@
             <scope>provided</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>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git 
a/src/main/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheck.java
 
b/src/main/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheck.java
index 38bf41e..3ca3a36 100644
--- 
a/src/main/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheck.java
+++ 
b/src/main/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheck.java
@@ -23,6 +23,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import org.apache.felix.hc.api.FormattingResultLog;
+import org.apache.felix.hc.api.HealthCheck;
+import org.apache.felix.hc.api.Result;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
@@ -36,12 +39,9 @@ import org.apache.felix.scr.annotations.References;
 import org.apache.felix.scr.annotations.Service;
 import org.apache.sling.commons.osgi.PropertiesUtil;
 import org.apache.sling.distribution.agent.spi.DistributionAgent;
-import org.apache.sling.distribution.queue.spi.DistributionQueue;
 import org.apache.sling.distribution.queue.DistributionQueueEntry;
 import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
-import org.apache.sling.hc.api.HealthCheck;
-import org.apache.sling.hc.api.Result;
-import org.apache.sling.hc.util.FormattingResultLog;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git 
a/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java
 
b/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java
index d0bcd1d..6b39611 100644
--- 
a/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java
+++ 
b/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java
@@ -30,7 +30,7 @@ import 
org.apache.sling.distribution.queue.spi.DistributionQueue;
 import org.apache.sling.distribution.queue.DistributionQueueEntry;
 import org.apache.sling.distribution.queue.DistributionQueueItem;
 import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
-import org.apache.sling.hc.api.Result;
+import org.apache.felix.hc.api.Result;
 import org.junit.Test;
 
 import static org.junit.Assert.assertFalse;