svn commit: r1755735 - in /sling/trunk/contrib/extensions/hapi/client: pom.xml src/main/java/org/apache/sling/hapi/client/package-info.java

[cziegeler]

Author: cziegeler
Date: Wed Aug 10 12:48:46 2016
New Revision: 1755735

URL: http://svn.apache.org/viewvc?rev=1755735&view=rev
Log:
Update to latest parent pom, clean up pom, use OSGi annotations

Modified:
    sling/trunk/contrib/extensions/hapi/client/pom.xml
    
sling/trunk/contrib/extensions/hapi/client/src/main/java/org/apache/sling/hapi/client/package-info.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=1755735&r1=1755734&r2=1755735&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/hapi/client/pom.xml (original)
+++ sling/trunk/contrib/extensions/hapi/client/pom.xml Wed Aug 10 12:48:46 2016
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>26</version>
+        <version>28</version>
         <relativePath />
     </parent>
 
@@ -74,21 +74,25 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <version>4.5.1</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpmime</artifactId>
             <version>4.5</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
             <version>2.5</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>2.5</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.jsoup</groupId>
@@ -98,7 +102,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.21</version>
         </dependency>
         <!-- test scope -->
         <dependency>
@@ -111,13 +114,10 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.21</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 </project>

Modified: 
sling/trunk/contrib/extensions/hapi/client/src/main/java/org/apache/sling/hapi/client/package-info.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/hapi/client/src/main/java/org/apache/sling/hapi/client/package-info.java?rev=1755735&r1=1755734&r2=1755735&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/hapi/client/src/main/java/org/apache/sling/hapi/client/package-info.java
 (original)
+++ 
sling/trunk/contrib/extensions/hapi/client/src/main/java/org/apache/sling/hapi/client/package-info.java
 Wed Aug 10 12:48:46 2016
@@ -17,7 +17,5 @@
  * under the License.
  
******************************************************************************/
 
-@Version("1.0.0")
+@org.osgi.annotation.versioning.Version("1.0.0")
 package org.apache.sling.hapi.client;
-
-import aQute.bnd.annotation.Version;