This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git
The following commit(s) were added to refs/heads/master by this push:
new faae160 SLING-9999 - Remove cyclic dependency between scripting and
servlets features
faae160 is described below
commit faae160193e3303b7e10b345ba68f225cf8891d2
Author: Radu Cotescu <[email protected]>
AuthorDate: Tue Mar 2 14:20:14 2021 +0100
SLING-9999 - Remove cyclic dependency between scripting and servlets
features
* moved the o.a.s.servlets.resolver.bundle.tracker API to a dedicated bundle
---
pom.xml | 2 +-
.../scripting/core/impl/bundled/AbstractBundledRenderUnit.java | 2 +-
.../core/impl/bundled/BundleRenderUnitFinderImpl.java | 10 +++++-----
.../sling/scripting/core/impl/bundled/ExecutableUnit.java | 2 +-
.../sling/scripting/core/impl/bundled/PrecompiledScript.java | 2 +-
.../org/apache/sling/scripting/core/impl/bundled/Script.java | 2 +-
.../scripting/core/impl/bundled/ScriptContextProvider.java | 2 +-
.../sling/scripting/core/it/ScriptingCoreTestSupport.java | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6791b69..fdac974 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,7 +162,7 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.servlets.resolver.api</artifactId>
+ <artifactId>org.apache.sling.scripting.spi</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
diff --git
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/AbstractBundledRenderUnit.java
b/src/main/java/org/apache/sling/scripting/core/impl/bundled/AbstractBundledRenderUnit.java
index 1492a8b..a4c6777 100644
---
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/AbstractBundledRenderUnit.java
+++
b/src/main/java/org/apache/sling/scripting/core/impl/bundled/AbstractBundledRenderUnit.java
@@ -36,7 +36,7 @@ import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.scripting.core.impl.helper.OnDemandReaderRequest;
import org.apache.sling.scripting.core.impl.helper.OnDemandWriterResponse;
-import org.apache.sling.servlets.resolver.bundle.tracker.TypeProvider;
+import org.apache.sling.scripting.spi.bundle.TypeProvider;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.osgi.framework.Bundle;
diff --git
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/BundleRenderUnitFinderImpl.java
b/src/main/java/org/apache/sling/scripting/core/impl/bundled/BundleRenderUnitFinderImpl.java
index 900d47d..4bbecff 100644
---
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/BundleRenderUnitFinderImpl.java
+++
b/src/main/java/org/apache/sling/scripting/core/impl/bundled/BundleRenderUnitFinderImpl.java
@@ -27,11 +27,11 @@ import java.util.Set;
import org.apache.commons.lang3.StringUtils;
import org.apache.sling.commons.compiler.source.JavaEscapeHelper;
-import org.apache.sling.servlets.resolver.bundle.tracker.BundledRenderUnit;
-import
org.apache.sling.servlets.resolver.bundle.tracker.BundledRenderUnitCapability;
-import
org.apache.sling.servlets.resolver.bundle.tracker.BundledRenderUnitFinder;
-import org.apache.sling.servlets.resolver.bundle.tracker.ResourceType;
-import org.apache.sling.servlets.resolver.bundle.tracker.TypeProvider;
+import org.apache.sling.scripting.spi.bundle.BundledRenderUnit;
+import org.apache.sling.scripting.spi.bundle.BundledRenderUnitCapability;
+import org.apache.sling.scripting.spi.bundle.BundledRenderUnitFinder;
+import org.apache.sling.scripting.spi.bundle.ResourceType;
+import org.apache.sling.scripting.spi.bundle.TypeProvider;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.osgi.framework.Bundle;
diff --git
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/ExecutableUnit.java
b/src/main/java/org/apache/sling/scripting/core/impl/bundled/ExecutableUnit.java
index 3e33ad5..b70f444 100644
---
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/ExecutableUnit.java
+++
b/src/main/java/org/apache/sling/scripting/core/impl/bundled/ExecutableUnit.java
@@ -22,7 +22,7 @@ import javax.script.ScriptContext;
import javax.script.ScriptEngine;
import javax.script.ScriptException;
-import org.apache.sling.servlets.resolver.bundle.tracker.BundledRenderUnit;
+import org.apache.sling.scripting.spi.bundle.BundledRenderUnit;
import org.jetbrains.annotations.NotNull;
interface ExecutableUnit extends BundledRenderUnit
diff --git
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/PrecompiledScript.java
b/src/main/java/org/apache/sling/scripting/core/impl/bundled/PrecompiledScript.java
index 01f64c7..d5d17a8 100644
---
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/PrecompiledScript.java
+++
b/src/main/java/org/apache/sling/scripting/core/impl/bundled/PrecompiledScript.java
@@ -26,7 +26,7 @@ import javax.script.ScriptEngine;
import javax.script.ScriptException;
import org.apache.commons.lang3.StringUtils;
-import org.apache.sling.servlets.resolver.bundle.tracker.TypeProvider;
+import org.apache.sling.scripting.spi.bundle.TypeProvider;
import org.jetbrains.annotations.NotNull;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
diff --git
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/Script.java
b/src/main/java/org/apache/sling/scripting/core/impl/bundled/Script.java
index 5776290..f92f6c7 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/bundled/Script.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/bundled/Script.java
@@ -34,8 +34,8 @@ import javax.script.ScriptEngine;
import javax.script.ScriptException;
import org.apache.commons.io.IOUtils;
-import org.apache.sling.servlets.resolver.bundle.tracker.TypeProvider;
import org.apache.sling.scripting.core.ScriptNameAwareReader;
+import org.apache.sling.scripting.spi.bundle.TypeProvider;
import org.jetbrains.annotations.NotNull;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
diff --git
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/ScriptContextProvider.java
b/src/main/java/org/apache/sling/scripting/core/impl/bundled/ScriptContextProvider.java
index 79fbeb1..3ce7ef1 100644
---
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/ScriptContextProvider.java
+++
b/src/main/java/org/apache/sling/scripting/core/impl/bundled/ScriptContextProvider.java
@@ -41,8 +41,8 @@ import org.apache.sling.scripting.api.BindingsValuesProvider;
import org.apache.sling.scripting.api.BindingsValuesProvidersByContext;
import
org.apache.sling.scripting.api.resource.ScriptingResourceResolverProvider;
import org.apache.sling.scripting.core.impl.helper.ProtectedBindings;
-import org.apache.sling.servlets.resolver.bundle.tracker.BundledRenderUnit;
import org.apache.sling.scripting.core.ScriptHelper;
+import org.apache.sling.scripting.spi.bundle.BundledRenderUnit;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
diff --git
a/src/test/java/org/apache/sling/scripting/core/it/ScriptingCoreTestSupport.java
b/src/test/java/org/apache/sling/scripting/core/it/ScriptingCoreTestSupport.java
index be30f41..7655773 100644
---
a/src/test/java/org/apache/sling/scripting/core/it/ScriptingCoreTestSupport.java
+++
b/src/test/java/org/apache/sling/scripting/core/it/ScriptingCoreTestSupport.java
@@ -61,7 +61,7 @@ public class ScriptingCoreTestSupport extends TestSupport {
mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.hamcrest").versionAsInProject(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.compiler").versionAsInProject(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.johnzon").versionAsInProject(),
-
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.resolver.api").versionAsInProject(),
+
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.spi").versionAsInProject(),
junitBundles(),
awaitility(),
vmOption(System.getProperty("jacoco.command"))
