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

[radu]

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-sightly-testing.git


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

commit fd446543c6a4f6c88af5837282130a78e0ccf126
Author: Radu Cotescu <r...@apache.org>
AuthorDate: Tue Mar 2 15:59:04 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                             | 8 +++++++-
 src/test/provisioning/scripting.txt | 1 +
 src/test/provisioning/sling.txt     | 1 -
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d077583..8fc10c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,8 +372,14 @@ Require-Capability: 
osgi.extender;filter:="(&(osgi.extender=sling.scripting)(ver
 
         <dependency>
             <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.scripting.spi</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.scripting.core</artifactId>
-            <version>2.3.4</version>
+            <version>2.3.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/src/test/provisioning/scripting.txt 
b/src/test/provisioning/scripting.txt
index 9cac8fd..ef5e8ea 100644
--- a/src/test/provisioning/scripting.txt
+++ b/src/test/provisioning/scripting.txt
@@ -31,6 +31,7 @@
 
 
     org.apache.sling/org.apache.sling.scripting.api/2.2.0
+    org.apache.sling/org.apache.sling.scripting.spi
     org.apache.sling/org.apache.sling.scripting.core
     org.apache.sling/org.apache.sling.scripting.javascript/3.1.2
     org.apache.sling/org.apache.sling.scripting.jsp/2.4.0
diff --git a/src/test/provisioning/sling.txt b/src/test/provisioning/sling.txt
index cbef7e4..3aa5831 100644
--- a/src/test/provisioning/sling.txt
+++ b/src/test/provisioning/sling.txt
@@ -118,7 +118,6 @@
     org.apache.sling/org.apache.sling.serviceuser.webconsole/1.0.2
     org.apache.sling/org.apache.sling.servlets.get/2.1.40
     org.apache.sling/org.apache.sling.servlets.post/2.3.36
-    org.apache.sling/org.apache.sling.servlets.resolver.api/1.0.0-SNAPSHOT
     org.apache.sling/org.apache.sling.servlets.resolver/2.7.13-SNAPSHOT
     org.apache.sling/org.apache.sling.xss/2.1.18
     javax.mail/mail/1.5.0-b01