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-sightly.git
The following commit(s) were added to refs/heads/master by this push:
new 1567894 SLING-9999 Remove cyclic dependency between scripting and
servlets features
1567894 is described below
commit 1567894f6c1835a317c01e6c5b5987a260a74757
Author: Oliver Lietz <[email protected]>
AuthorDate: Mon Dec 28 22:56:27 2020 +0100
SLING-9999 Remove cyclic dependency between scripting and servlets features
switch from org.apache.sling.servlets.resolver to org.apache.sling.api and
org.apache.sling.scripting.api
---
pom.xml | 4 ++--
.../apache/sling/scripting/sightly/engine/BundledUnitManager.java | 2 +-
.../sightly/impl/engine/bundled/BundledUnitManagerImpl.java | 7 +++----
.../sightly/impl/engine/extension/use/ScriptUseProvider.java | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index d478e4a..734f75b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,7 +173,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.21.0</version>
+ <version>2.23.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -185,7 +185,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.api</artifactId>
- <version>2.1.12</version>
+ <version>2.2.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git
a/src/main/java/org/apache/sling/scripting/sightly/engine/BundledUnitManager.java
b/src/main/java/org/apache/sling/scripting/sightly/engine/BundledUnitManager.java
index a0bd184..0d4cd55 100644
---
a/src/main/java/org/apache/sling/scripting/sightly/engine/BundledUnitManager.java
+++
b/src/main/java/org/apache/sling/scripting/sightly/engine/BundledUnitManager.java
@@ -22,7 +22,7 @@ import java.net.URL;
import javax.script.Bindings;
-import org.apache.sling.servlets.resolver.bundle.tracker.BundledRenderUnit;
+import org.apache.sling.scripting.api.bundle.BundledRenderUnit;
import org.apache.sling.scripting.sightly.render.RenderUnit;
import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
diff --git
a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/bundled/BundledUnitManagerImpl.java
b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/bundled/BundledUnitManagerImpl.java
index 1676bf8..75de637 100644
---
a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/bundled/BundledUnitManagerImpl.java
+++
b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/bundled/BundledUnitManagerImpl.java
@@ -33,15 +33,14 @@ import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceUtil;
+import org.apache.sling.api.resource.type.ResourceType;
import org.apache.sling.commons.compiler.source.JavaEscapeHelper;
import org.apache.sling.scripting.api.CachedScript;
import org.apache.sling.scripting.api.ScriptCache;
+import org.apache.sling.scripting.api.bundle.BundledRenderUnit;
+import org.apache.sling.scripting.api.bundle.TypeProvider;
import
org.apache.sling.scripting.api.resource.ScriptingResourceResolverProvider;
-import org.apache.sling.servlets.resolver.bundle.tracker.BundledRenderUnit;
-import org.apache.sling.servlets.resolver.bundle.tracker.ResourceType;
-import org.apache.sling.servlets.resolver.bundle.tracker.TypeProvider;
import org.apache.sling.scripting.core.ScriptNameAwareReader;
import org.apache.sling.scripting.sightly.engine.BundledUnitManager;
import org.apache.sling.scripting.sightly.impl.engine.SightlyCompiledScript;
diff --git
a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/ScriptUseProvider.java
b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/ScriptUseProvider.java
index 6138bba..1cbbb16 100644
---
a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/ScriptUseProvider.java
+++
b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/ScriptUseProvider.java
@@ -36,8 +36,8 @@ import org.apache.sling.api.scripting.SlingBindings;
import org.apache.sling.api.scripting.SlingScript;
import org.apache.sling.scripting.api.CachedScript;
import org.apache.sling.scripting.api.ScriptCache;
+import org.apache.sling.scripting.api.bundle.BundledRenderUnit;
import
org.apache.sling.scripting.api.resource.ScriptingResourceResolverProvider;
-import org.apache.sling.servlets.resolver.bundle.tracker.BundledRenderUnit;
import org.apache.sling.scripting.core.ScriptNameAwareReader;
import
org.apache.sling.scripting.sightly.impl.engine.SightlyScriptEngineFactory;
import
org.apache.sling.scripting.sightly.impl.engine.bundled.BundledUnitManagerImpl;
