[sling-org-apache-sling-scripting-jsp] branch master updated: SLING-9999 Remove cyclic dependency between scripting and servlets features

[olli]

This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-jsp.git


The following commit(s) were added to refs/heads/master by this push:
     new ccdb902  SLING-9999 Remove cyclic dependency between scripting and 
servlets features
ccdb902 is described below

commit ccdb90266f254bb2143a5d870725a8f4b28d4d8b
Author: Oliver Lietz <o...@apache.org>
AuthorDate: Mon Dec 28 22:55:03 2020 +0100

    SLING-9999 Remove cyclic dependency between scripting and servlets features
    
    switch from org.apache.sling.servlets.resolver to 
org.apache.sling.scripting.api
---
 pom.xml                                                           | 8 +-------
 .../java/org/apache/sling/scripting/jsp/PrecompiledJSPRunner.java | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5336c54..6484f20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.scripting.api</artifactId>
-            <version>2.2.0</version>
+            <version>2.2.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -144,11 +144,5 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.servlets.resolver</artifactId>
-            <version>2.7.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git 
a/src/main/java/org/apache/sling/scripting/jsp/PrecompiledJSPRunner.java 
b/src/main/java/org/apache/sling/scripting/jsp/PrecompiledJSPRunner.java
index 6d259ef..1895c63 100644
--- a/src/main/java/org/apache/sling/scripting/jsp/PrecompiledJSPRunner.java
+++ b/src/main/java/org/apache/sling/scripting/jsp/PrecompiledJSPRunner.java
@@ -31,7 +31,7 @@ import org.apache.sling.api.SlingIOException;
 import org.apache.sling.api.SlingServletException;
 import org.apache.sling.api.scripting.SlingBindings;
 import org.apache.sling.commons.compiler.source.JavaEscapeHelper;
-import org.apache.sling.servlets.resolver.bundle.tracker.BundledRenderUnit;
+import org.apache.sling.scripting.api.bundle.BundledRenderUnit;
 import org.apache.sling.scripting.jsp.jasper.compiler.JspRuntimeContext;
 import org.apache.sling.scripting.jsp.jasper.runtime.AnnotationProcessor;
 import org.apache.sling.scripting.jsp.jasper.runtime.HttpJspBase;