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 2cd38ae SLING-9999 - Remove cyclic dependency between scripting and
servlets features
2cd38ae is described below
commit 2cd38ae6c0ad01647128ffc8414f220631da71d1
Author: Radu Cotescu <[email protected]>
AuthorDate: Wed Apr 28 17:19:23 2021 +0200
SLING-9999 - Remove cyclic dependency between scripting and servlets
features
* updated to the released dependency for o.a.s.scripting.spi
---
pom.xml | 8 +++++++-
src/test/provisioning/sling.txt | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8fc10c0..9b7afea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -373,7 +373,7 @@ 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>
+ <version>1.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -382,6 +382,12 @@ Require-Capability:
osgi.extender;filter:="(&(osgi.extender=sling.scripting)(ver
<version>2.3.5-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.servlets.resolver</artifactId>
+ <version>2.7.13-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
<!-- Dependencies for the Test Build and Run -->
<dependency>
diff --git a/src/test/provisioning/sling.txt b/src/test/provisioning/sling.txt
index 3aa5831..1a6f2aa 100644
--- a/src/test/provisioning/sling.txt
+++ b/src/test/provisioning/sling.txt
@@ -118,7 +118,7 @@
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/2.7.13-SNAPSHOT
+ org.apache.sling/org.apache.sling.servlets.resolver
org.apache.sling/org.apache.sling.xss/2.1.18
javax.mail/mail/1.5.0-b01
org.apache.geronimo.bundles/jstl/1.2_1
