[sling-org-apache-sling-jcr-jackrabbit-usermanager] 22/33: SLING-2944 Revert Sling API dependency to 2.2.0 again

[ro...@apache.org]

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

rombert pushed a commit to annotated tag org.apache.sling.jcr.jackrabbit.usermanager-2.2.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-jackrabbit-usermanager.git

commit 5a5f0deb7ffbaf12c0aa942893dab6ba9b918dd4
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Mon Aug 5 15:28:17 2013 +0000

    SLING-2944 Revert Sling API dependency to 2.2.0 again
    
    Sling API 2.4.0 is not required and probably only has been
    updated to make sure the import version range for the Resource
    API is correct. Given SLING-2993 we should actually provide
    proper annotation of implemented API for the bundle plugin
    to properly devise the import version range.
    
    For now removing the 'provide:=true' import tag solves this
    issue, since we only implement the ResourceProvider interface
    (intended to be @ConsumerType) and extend AbstractSlingResource
    (which is safe to extend in @ConsumerType fashion).
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-usermanager@1510567 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                                             | 6 +-----
 .../jackrabbit/usermanager/impl/resource/AuthorizableResource.java  | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index c32d1a6..9710b86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,10 +74,6 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Import-Package>
-                            org.apache.sling.api.resource;provide:=true,
-                            *
-                        </Import-Package>
                         <Export-Package>
                             org.apache.sling.jackrabbit.usermanager;version=2.2.1,
                         </Export-Package>
@@ -103,7 +99,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
-            <version>2.4.0</version>
+            <version>2.2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResource.java b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResource.java
index fad6c38..8f1c5f2 100644
--- a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResource.java
+++ b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResource.java
@@ -39,7 +39,7 @@ import org.apache.sling.api.resource.ValueMap;
     @Adapter(condition="If the resource is an AuthorizableResource and represents a JCR User", value = User.class),
     @Adapter(condition="If the resource is an AuthorizableResource and represents a JCR Group", value = Group.class)
 })
-public class AuthorizableResource extends AbstractResource implements Resource {
+public class AuthorizableResource extends AbstractResource {
     private Authorizable authorizable = null;
 
     private ResourceResolver resourceResolver = null;

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