[sling-org-apache-sling-fsresource] 06/14: SLING-2944 Revert Sling API dependency to 2.3.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.fsresource-1.1.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git

commit 592bc1ee0be0cf96776f5f5c80cde2da784e522c
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Mon Aug 5 15:24:29 2013 +0000

    SLING-2944 Revert Sling API dependency to 2.3.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/extensions/fsresource@1510565 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                                            | 6 +-----
 src/main/java/org/apache/sling/fsprovider/internal/FsResource.java | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 36c8bec..94ac58c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,10 +74,6 @@
                         <Private-Package>
                             org.apache.sling.fsprovider.internal
                         </Private-Package>
-                        <Import-Package>
-                            org.apache.sling.api.resource;provide:=true,
-                            *
-                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
@@ -91,7 +87,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
-            <version>2.4.0</version>
+            <version>2.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
diff --git a/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java b/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
index bcc8bb1..1397045 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
     @Adapter({File.class, URL.class}),
     @Adapter(condition="If the resource is an FsResource and is a readable file.", value=InputStream.class)
 })
-public class FsResource extends AbstractResource implements Resource {
+public class FsResource extends AbstractResource {
 
     /**
      * The resource type for file system files mapped into the resource tree by

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