[sling-org-apache-sling-bundleresource-impl] 06/10: 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.bundleresource.impl-2.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git

commit 51eebbf61e53b90f1bdaf6362ae72e61c32e2cf6
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Mon Aug 5 15:22:11 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/bundleresource@1510562 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                                             | 6 +-----
 .../java/org/apache/sling/bundleresource/impl/BundleResource.java   | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6de29d0..741dafd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,10 +63,6 @@
                             org.apache.sling.bundleresource.*,
                             org.osgi.util.tracker
                         </Private-Package>
-                        <Import-Package>
-                            org.apache.sling.api.resource;provide:=true,
-                            *
-                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
@@ -93,7 +89,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
-            <version>2.4.0</version>
+            <version>2.3.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java b/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java
index 162adb1..b9ec82e 100644
--- a/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java
+++ b/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java
@@ -33,7 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /** A Resource that wraps a Bundle entry */
-public class BundleResource extends AbstractResource implements Resource {
+public class BundleResource extends AbstractResource {
 
     /** default log */
     private final Logger log = LoggerFactory.getLogger(getClass());

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