SLING-6165 - Expose a service for Sling Scripting that provides request-scoped Resource Resolvers for scripting dependencies
* correctly register the ScriptingResourceResolverProviderImpl as a ServletRequestListener through Whiteboard
* extended the ResourceResolverWrapper provided through SLING-6336, in order to avoid importing the
org.apache.sling.api.resource package with a minor-limited import range
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1771783 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index c35812e..8a62ac3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.11.0</version>
+ <version>2.15.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/src/main/java/org/apache/sling/scripting/api/resource/ScriptingResourceResolverProvider.java b/src/main/java/org/apache/sling/scripting/api/resource/ScriptingResourceResolverProvider.java
index 7ffe74c..fb0a1e1 100644
--- a/src/main/java/org/apache/sling/scripting/api/resource/ScriptingResourceResolverProvider.java
+++ b/src/main/java/org/apache/sling/scripting/api/resource/ScriptingResourceResolverProvider.java
@@ -17,8 +17,7 @@
package org.apache.sling.scripting.api.resource;
import org.apache.sling.api.resource.ResourceResolver;
-
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The {@code ScriptingResourceResolverProvider} provides methods to obtain {@link ResourceResolver}s that can be used by scripting
diff --git a/src/main/java/org/apache/sling/scripting/api/resource/package-info.java b/src/main/java/org/apache/sling/scripting/api/resource/package-info.java
index 4efbd25..50c1308 100644
--- a/src/main/java/org/apache/sling/scripting/api/resource/package-info.java
+++ b/src/main/java/org/apache/sling/scripting/api/resource/package-info.java
@@ -22,8 +22,7 @@
* context of a Servlet API Request might lead to improper cleaning of objects whose life-cycle should not be longer than the request to
* which they're bound to (for example per-thread objects)</i>.</p>
*
- * <p>This package depends on the {@link org.apache.sling.api.resource} API, version 2.9.0 (bundle {@code org.apache.sling.api}, version
- * 2.11.0).</p>
+ * <p>This package depends on the {@link org.apache.sling.api.resource} API, version >= 2.10.0.</p>
*/
@Version("1.0.0")
package org.apache.sling.scripting.api.resource;
