You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2020/09/14 11:07:43 UTC
[sling-org-apache-sling-commons-scheduler] branch master updated:
Revert "SLING-8354 Migrate to Felix HC API"
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-scheduler.git
The following commit(s) were added to refs/heads/master by this push:
new 57dd049 Revert "SLING-8354 Migrate to Felix HC API"
57dd049 is described below
commit 57dd049ca4ad7a1050b328f25060f035b3cbfc6e
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Mon Sep 14 13:07:15 2020 +0200
Revert "SLING-8354 Migrate to Felix HC API"
This reverts commit f6a4f78a9fbfe37e127f36fbb96e5615f963d4bf.
---
pom.xml | 9 +++++----
.../sling/commons/scheduler/impl/SchedulerHealthCheck.java | 6 +++---
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index c83fbfa..d5efc50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,8 @@
!javax.xml.bind,
org.apache.sling.discovery;resolution:=optional,
org.apache.sling.settings;resolution:=optional,
- org.apache.felix.hc.api;resolution:=optional,
+ org.apache.sling.hc.api;resolution:=optional,
+ org.apache.sling.hc.util;resolution:=optional,
*
</Import-Package>
<Export-Package>
@@ -175,9 +176,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.healthcheck.api</artifactId>
- <version>2.0.0</version>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.hc.core</artifactId>
+ <version>1.0.6</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/commons/scheduler/impl/SchedulerHealthCheck.java b/src/main/java/org/apache/sling/commons/scheduler/impl/SchedulerHealthCheck.java
index 82dd1cd..6cb51aa 100644
--- a/src/main/java/org/apache/sling/commons/scheduler/impl/SchedulerHealthCheck.java
+++ b/src/main/java/org/apache/sling/commons/scheduler/impl/SchedulerHealthCheck.java
@@ -22,9 +22,9 @@ import java.util.Iterator;
import java.util.Map.Entry;
import java.util.SortedMap;
-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.hc.api.HealthCheck;
+import org.apache.sling.hc.api.Result;
+import org.apache.sling.hc.util.FormattingResultLog;
import org.osgi.framework.Constants;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;