Author: fmeschbe
Date: Mon Aug 5 15:24:29 2013
New Revision: 1510565
URL: http://svn.apache.org/r1510565
Log:
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).
Modified:
sling/trunk/bundles/extensions/fsresource/pom.xml
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
Modified: sling/trunk/bundles/extensions/fsresource/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/pom.xml?rev=1510565&r1=1510564&r2=1510565&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/fsresource/pom.xml (original)
+++ sling/trunk/bundles/extensions/fsresource/pom.xml Mon Aug 5 15:24:29 2013
@@ -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>
Modified:
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java?rev=1510565&r1=1510564&r2=1510565&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
(original)
+++
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
Mon Aug 5 15:24:29 2013
@@ -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
