commit baf2a16d985adc67a2257554cd63d4bb147a5812
author Oliver Lietz <olli@apache.org> Wed Feb 17 17:14:43 2016 +0000
committer Oliver Lietz <olli@apache.org> Wed Feb 17 17:14:43 2016 +0000
tree c612d3649619de26cf23eb67da843df6d8d5b52e
parent df2e76749d5db27e9a0f57ded662f9b454467017

SLING-5526 Remove Launchpad API dependency from Discovery Impl

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1730878 13f79535-47bb-0310-9956-ffa450edef68

pom.xml

diff --git a/pom.xml b/pom.xml
index a5bed42..4c1f5a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
 		<dependency>
 			<groupId>org.apache.sling</groupId>
 			<artifactId>org.apache.sling.discovery.base</artifactId>
-			<version>1.1.0</version>
+			<version>1.1.3-SNAPSHOT</version>
             <scope>provided</scope>
 		</dependency>
         <!-- besides including discovery.base' normal jar above, 
@@ -160,7 +160,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.discovery.base</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.3-SNAPSHOT</version>
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
@@ -205,12 +205,6 @@
             <scope>provided</scope>
 		</dependency>
         <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.launchpad.api</artifactId>
-		    <version>1.1.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>2.4</version>

src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java

diff --git a/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java b/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java
index d21ca95..049179d 100644
--- a/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java
+++ b/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java
@@ -52,7 +52,6 @@
 import org.apache.sling.discovery.impl.cluster.voting.VotingView;
 import org.apache.sling.discovery.impl.common.View;
 import org.apache.sling.discovery.impl.common.ViewHelper;
-import org.apache.sling.launchpad.api.StartupListener;
 import org.apache.sling.settings.SlingSettingsService;
 import org.osgi.framework.BundleException;
 import org.osgi.service.http.HttpService;
@@ -65,7 +64,7 @@
  * remote TopologyConnectorServlets.
  */
 @Component
-@Service(value = { HeartbeatHandler.class, StartupListener.class })
+@Service(value = HeartbeatHandler.class)
 @Reference(referenceInterface=HttpService.class,
            cardinality=ReferenceCardinality.OPTIONAL_MULTIPLE,
            policy=ReferencePolicy.DYNAMIC)