You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2021/01/29 10:20:08 UTC
[sling-org-apache-sling-scripting-core] 04/04: SLING-9999 - Remove
cyclic dependency between scripting and servlets features
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
commit 83f51ac4516e29ea5dd4c91313f5e2221ec6c586
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Fri Jan 29 11:19:44 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 | 18 +++++++++++++++---
.../scripting/core/it/ScriptingCoreTestSupport.java | 3 ++-
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6e2e9c6..6791b69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.22.0</version>
+ <version>2.23.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -162,6 +162,12 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.servlets.resolver.api</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.threads</artifactId>
<version>3.1.0</version>
<scope>provided</scope>
@@ -361,8 +367,14 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.servlets.resolver</artifactId>
- <version>2.7.0</version>
- <scope>provided</scope>
+ <version>2.7.13-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.johnzon</artifactId>
+ <version>1.2.6</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
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 625671a..be30f41 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
@@ -60,7 +60,8 @@ public class ScriptingCoreTestSupport extends TestSupport {
mavenBundle().groupId("org.jsoup").artifactId("jsoup").versionAsInProject(),
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.servlets.resolver").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(),
junitBundles(),
awaitility(),
vmOption(System.getProperty("jacoco.command"))