svn commit: r1785742 - in /sling/trunk/contrib/extensions/hapi/client: pom.xml src/main/java/org/apache/sling/hapi/client/impl/HtmlClientServiceImpl.java

[olli]

Author: olli
Date: Mon Mar  6 19:22:12 2017
New Revision: 1785742

URL: http://svn.apache.org/viewvc?rev=1785742&view=rev
Log:
use OSGi annotations and remove unused Maven SCR Plugin

Modified:
    sling/trunk/contrib/extensions/hapi/client/pom.xml
    
sling/trunk/contrib/extensions/hapi/client/src/main/java/org/apache/sling/hapi/client/impl/HtmlClientServiceImpl.java

Modified: sling/trunk/contrib/extensions/hapi/client/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/hapi/client/pom.xml?rev=1785742&r1=1785741&r2=1785742&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/hapi/client/pom.xml (original)
+++ sling/trunk/contrib/extensions/hapi/client/pom.xml Mon Mar  6 19:22:12 2017
@@ -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>

Modified: 
sling/trunk/contrib/extensions/hapi/client/src/main/java/org/apache/sling/hapi/client/impl/HtmlClientServiceImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/hapi/client/src/main/java/org/apache/sling/hapi/client/impl/HtmlClientServiceImpl.java?rev=1785742&r1=1785741&r2=1785742&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/hapi/client/src/main/java/org/apache/sling/hapi/client/impl/HtmlClientServiceImpl.java
 (original)
+++ 
sling/trunk/contrib/extensions/hapi/client/src/main/java/org/apache/sling/hapi/client/impl/HtmlClientServiceImpl.java
 Mon Mar  6 19:22:12 2017
@@ -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);