Author: fmeschbe
Date: Mon Aug 5 15:22:11 2013
New Revision: 1510562
URL: http://svn.apache.org/r1510562
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/bundleresource/pom.xml
sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java
Modified: sling/trunk/bundles/extensions/bundleresource/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/bundleresource/pom.xml?rev=1510562&r1=1510561&r2=1510562&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/bundleresource/pom.xml (original)
+++ sling/trunk/bundles/extensions/bundleresource/pom.xml Mon Aug 5 15:22:11
2013
@@ -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>
Modified:
sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java?rev=1510562&r1=1510561&r2=1510562&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java
(original)
+++
sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java
Mon Aug 5 15:22:11 2013
@@ -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());
