You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/10/18 23:24:32 UTC

[sling-org-apache-sling-hapi-client] 24/26: use OSGi annotations and remove unused Maven SCR Plugin

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

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hapi-client.git

commit 32c39f860f51ed580fb5efff1b43074bf4794497
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Mar 6 19:22:12 2017 +0000

    use OSGi annotations and remove unused Maven SCR Plugin
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1785742 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                                           | 4 ----
 .../org/apache/sling/hapi/client/impl/HtmlClientServiceImpl.java  | 8 ++++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9bf241c..332491a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,10 +47,6 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.sling</groupId>
                 <artifactId>maven-sling-plugin</artifactId>
             </plugin>
diff --git a/src/main/java/org/apache/sling/hapi/client/impl/HtmlClientServiceImpl.java b/src/main/java/org/apache/sling/hapi/client/impl/HtmlClientServiceImpl.java
index 623c47d..d3f6f4b 100644
--- a/src/main/java/org/apache/sling/hapi/client/impl/HtmlClientServiceImpl.java
+++ b/src/main/java/org/apache/sling/hapi/client/impl/HtmlClientServiceImpl.java
@@ -18,19 +18,19 @@
  ******************************************************************************/
 package org.apache.sling.hapi.client.impl;
 
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.sling.hapi.client.HtmlClient;
 import org.apache.sling.hapi.client.HtmlClientService;
 import org.apache.sling.hapi.client.impl.microdata.MicrodataHtmlClient;
+import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.net.URISyntaxException;
 
-@Component(metatype = false)
-@Service(value = HtmlClientService.class)
+@Component(
+    service = HtmlClientService.class
+)
 public class HtmlClientServiceImpl implements HtmlClientService {
     private final Logger LOG = LoggerFactory.getLogger(HtmlClientService.class);
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.