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-bundle-tracker-it.git
The following commit(s) were added to refs/heads/master by this push:
new 31d6d0c SLING-9999 - Remove cyclic dependency between scripting and
servlets features
31d6d0c is described below
commit 31d6d0c27bf850e1bbd24b2de5c7d10ed0d5176c
Author: Radu Cotescu <[email protected]>
AuthorDate: Fri Jan 29 11:27:51 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 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
examples/org-apache-sling-scripting-examplebundle/pom.xml | 2 +-
it/pom.xml | 14 ++++++++++----
it/src/test/provisioning/it-model.txt | 1 +
it/src/test/provisioning/sling.txt | 2 +-
8 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/examples/org-apache-sling-scripting-examplebundle-extend1/pom.xml
b/examples/org-apache-sling-scripting-examplebundle-extend1/pom.xml
index e36c9e8..04d952e 100644
--- a/examples/org-apache-sling-scripting-examplebundle-extend1/pom.xml
+++ b/examples/org-apache-sling-scripting-examplebundle-extend1/pom.xml
@@ -45,7 +45,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>scriptingbundle-maven-plugin</artifactId>
- <version>0.2.2</version>
+ <version>0.2.3-SNAPSHOT</version>
<executions>
<execution>
<phase>prepare-package</phase>
diff --git a/examples/org-apache-sling-scripting-examplebundle-extend2/pom.xml
b/examples/org-apache-sling-scripting-examplebundle-extend2/pom.xml
index a3ef7d6..dd2f8d0 100644
--- a/examples/org-apache-sling-scripting-examplebundle-extend2/pom.xml
+++ b/examples/org-apache-sling-scripting-examplebundle-extend2/pom.xml
@@ -45,7 +45,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>scriptingbundle-maven-plugin</artifactId>
- <version>0.2.2</version>
+ <version>0.2.3-SNAPSHOT</version>
<executions>
<execution>
<phase>prepare-package</phase>
diff --git
a/examples/org-apache-sling-scripting-examplebundle-precompiled-jsp/pom.xml
b/examples/org-apache-sling-scripting-examplebundle-precompiled-jsp/pom.xml
index 9a50dd6..df9282c 100644
--- a/examples/org-apache-sling-scripting-examplebundle-precompiled-jsp/pom.xml
+++ b/examples/org-apache-sling-scripting-examplebundle-precompiled-jsp/pom.xml
@@ -45,7 +45,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>scriptingbundle-maven-plugin</artifactId>
- <version>0.2.2</version>
+ <version>0.2.3-SNAPSHOT</version>
<executions>
<execution>
<phase>prepare-package</phase>
diff --git
a/examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml
b/examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml
index 7789232..fb3a70d 100644
--- a/examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml
+++ b/examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml
@@ -45,7 +45,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>scriptingbundle-maven-plugin</artifactId>
- <version>0.2.2</version>
+ <version>0.2.3-SNAPSHOT</version>
<executions>
<execution>
<phase>prepare-package</phase>
diff --git a/examples/org-apache-sling-scripting-examplebundle/pom.xml
b/examples/org-apache-sling-scripting-examplebundle/pom.xml
index 1b05802..fe9f102 100644
--- a/examples/org-apache-sling-scripting-examplebundle/pom.xml
+++ b/examples/org-apache-sling-scripting-examplebundle/pom.xml
@@ -45,7 +45,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>scriptingbundle-maven-plugin</artifactId>
- <version>0.2.2</version>
+ <version>0.2.3-SNAPSHOT</version>
<executions>
<execution>
<phase>prepare-package</phase>
diff --git a/it/pom.xml b/it/pom.xml
index 09678fe..e628e1b 100644
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -176,13 +176,19 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.core</artifactId>
- <version>2.3.0</version>
+ <version>2.3.5-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.servlets.resolver.api</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.servlets.resolver</artifactId>
- <version>2.7.4</version>
+ <version>2.7.13-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -194,13 +200,13 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.jsp</artifactId>
- <version>2.5.0</version>
+ <version>2.5.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly</artifactId>
- <version>1.4.3-1.4.0-SNAPSHOT</version>
+ <version>1.4.7-1.4.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/it/src/test/provisioning/it-model.txt
b/it/src/test/provisioning/it-model.txt
index c69876a..6079826 100644
--- a/it/src/test/provisioning/it-model.txt
+++ b/it/src/test/provisioning/it-model.txt
@@ -21,6 +21,7 @@
# Dependencies
[artifacts]
+ org.apache.sling/org.apache.sling.servlets.resolver.api
org.apache.sling/org.apache.sling.servlets.resolver
org.apache.sling/org.apache.sling.scripting.core
org.apache.sling/org.apache.sling.commons.compiler
diff --git a/it/src/test/provisioning/sling.txt
b/it/src/test/provisioning/sling.txt
index 07499d1..12775fe 100644
--- a/it/src/test/provisioning/sling.txt
+++ b/it/src/test/provisioning/sling.txt
@@ -46,7 +46,7 @@
commons-io/commons-io/2.6
commons-fileupload/commons-fileupload/1.4
org.apache.sling/org.apache.sling.commons.log.webconsole/1.0.0
- org.apache.sling/org.apache.sling.api/2.22.0
+ org.apache.sling/org.apache.sling.api/2.23.3-SNAPSHOT
org.apache.sling/org.apache.sling.auth.core/1.4.6
[artifacts startLevel=10]
