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 2020/07/10 11:27:07 UTC
[sling-org-apache-sling-scripting-sightly-testing] branch master
updated: SLING-9580 - Make the dependency resolution more resource-type
centric
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 279807c SLING-9580 - Make the dependency resolution more resource-type centric
279807c is described below
commit 279807cc94c1df5df8781ebff00e73abedcc41f9
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Fri Jul 10 13:26:16 2020 +0200
SLING-9580 - Make the dependency resolution more resource-type centric
* switched to latest releases + snapshot of the js.provider
---
pom.xml | 27 +++++++++++----------------
src/test/provisioning/scripting.txt | 2 +-
src/test/provisioning/sling.txt | 4 ++--
3 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index af698f6..b27d89f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,6 +106,7 @@
</execution>
<execution>
<id>package-starter</id>
+ <phase>pre-integration-test</phase>
<goals>
<goal>package</goal>
</goals>
@@ -143,7 +144,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>htl-maven-plugin</artifactId>
- <version>1.3.5-1.4.0-SNAPSHOT</version>
+ <version>2.0.0-1.4.0</version>
<executions>
<execution>
<id>validate-htl-scripts</id>
@@ -160,7 +161,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>scriptingbundle-maven-plugin</artifactId>
- <version>0.1.1-SNAPSHOT</version>
+ <version>0.2.3-SNAPSHOT</version>
<executions>
<execution>
<phase>process-resources</phase>
@@ -292,9 +293,9 @@ Sling-Initial-Content: SLING-INF/content;overwrite:=true;path:=/content/sightly-
# Dependencies
[artifacts]
org.apache.sling/org.apache.sling.starter/12-SNAPSHOT/slingstart
- org.apache.sling/org.apache.sling.commons.compiler/2.3.7-SNAPSHOT
- org.apache.sling/org.apache.sling.servlets.resolver/2.6.5-SNAPSHOT
- org.apache.sling/org.apache.sling.scripting.core/2.2.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.commons.compiler/2.4.0
+ org.apache.sling/org.apache.sling.servlets.resolver/2.7.3-SNAPSHOT
+ org.apache.sling/org.apache.sling.scripting.core/2.3.0
</model>
<modelPattern>sightly.txt</modelPattern>
</configuration>
@@ -398,37 +399,31 @@ Sling-Initial-Content: SLING-INF/content;overwrite:=true;path:=/content/sightly-
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly.runtime</artifactId>
- <version>1.2.1-1.4.0-SNAPSHOT</version>
+ <version>1.2.2-1.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly.compiler</artifactId>
- <version>1.2.5-1.4.0-SNAPSHOT</version>
+ <version>1.2.6-1.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly.compiler.java</artifactId>
- <version>1.1.5-1.4.0-SNAPSHOT</version>
+ <version>1.2.0-1.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly</artifactId>
- <version>1.4.0-1.4.0-SNAPSHOT</version>
+ <version>1.4.0-1.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly.js.provider</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.scripting.sightly.models.provider</artifactId>
- <version>1.0.11-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/test/provisioning/scripting.txt b/src/test/provisioning/scripting.txt
index b323ff0..ee24386 100644
--- a/src/test/provisioning/scripting.txt
+++ b/src/test/provisioning/scripting.txt
@@ -21,7 +21,7 @@
[artifacts]
org.apache.sling/org.apache.sling.scripting.api/2.2.0
- org.apache.sling/org.apache.sling.scripting.core/2.2.0
+ org.apache.sling/org.apache.sling.scripting.core/2.3.0
org.apache.sling/org.apache.sling.scripting.javascript/3.1.2
org.apache.sling/org.apache.sling.scripting.jsp/2.4.0
org.apache.sling/org.apache.sling.scripting.jsp-api/1.0.2
diff --git a/src/test/provisioning/sling.txt b/src/test/provisioning/sling.txt
index c91c471..562680b 100644
--- a/src/test/provisioning/sling.txt
+++ b/src/test/provisioning/sling.txt
@@ -97,7 +97,7 @@
org.apache.sling/org.apache.sling.auth.form/1.0.16
org.apache.sling/org.apache.sling.bundleresource.impl/2.3.2
org.apache.sling/org.apache.sling.commons.classloader/1.4.4
- org.apache.sling/org.apache.sling.commons.compiler/2.3.6
+ org.apache.sling/org.apache.sling.commons.compiler/2.4.0
org.apache.sling/org.apache.sling.commons.fsclassloader/1.0.12
org.apache.sling/org.apache.sling.commons.mime/2.2.2
org.apache.sling/org.apache.sling.commons.osgi/2.4.0
@@ -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.6.4
+ org.apache.sling/org.apache.sling.servlets.resolver/2.7.2
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