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/02/26 16:58:42 UTC

[sling-org-apache-sling-scripting-bundle-tracker-it] branch master updated: SLING-9158 - Switch from JavaEscapeUtils to JavaEscapeHelper

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 de127fc  SLING-9158 - Switch from JavaEscapeUtils to JavaEscapeHelper
de127fc is described below

commit de127fc852dba27ce8a7e31b2ba40d8d8b547e18
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Wed Feb 26 17:58:19 2020 +0100

    SLING-9158 - Switch from JavaEscapeUtils to JavaEscapeHelper
    
    * removed JavaEscapeUtils and refactored callers to use JavaEscapeHelper
    * updated IT setup
---
 .../pom.xml                                              |  2 +-
 it/pom.xml                                               | 16 +++++++++++-----
 it/src/test/provisioning/it-model.txt                    |  4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml b/examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml
index fe532f8..99b8bc2 100644
--- a/examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml
+++ b/examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml
@@ -75,7 +75,7 @@
             <plugin>
                 <groupId>org.apache.sling</groupId>
                 <artifactId>htl-maven-plugin</artifactId>
-                <version>1.2.2-1.4.0</version>
+                <version>1.3.5-1.4.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <id>validate-htl-scripts</id>
diff --git a/it/pom.xml b/it/pom.xml
index 473f73b..8ab4baa 100644
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -181,20 +181,26 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.commons.compiler</artifactId>
+            <version>2.3.7-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.scripting.sightly</artifactId>
-            <version>1.2.1-1.4.0-SNAPSHOT</version>
+            <version>1.3.3-1.4.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.scripting.sightly.runtime</artifactId>
-            <version>1.1.1-1.4.0-SNAPSHOT</version>
+            <version>1.2.0-1.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.scripting.sightly.compiler</artifactId>
-            <version>1.2.1-1.4.0-SNAPSHOT</version>
+            <version>1.2.4-1.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -206,13 +212,13 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.scripting.sightly.js.provider</artifactId>
-            <version>1.0.28</version>
+            <version>1.1.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.scripting.sightly.models.provider</artifactId>
-            <version>1.0.8</version>
+            <version>1.0.10</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 1215af1..3c73e84 100644
--- a/it/src/test/provisioning/it-model.txt
+++ b/it/src/test/provisioning/it-model.txt
@@ -21,12 +21,12 @@
 
 # Dependencies
 [artifacts]
-  org.apache.sling/org.apache.sling.starter/11/slingstart
-  org.antlr/antlr4-runtime/4.7
+  org.apache.sling/org.apache.sling.starter/12-SNAPSHOT/slingstart
   org.apache.sling/org.apache.sling.scripting.sightly
   org.apache.sling/org.apache.sling.scripting.sightly.runtime
   org.apache.sling/org.apache.sling.scripting.sightly.compiler
   org.apache.sling/org.apache.sling.scripting.sightly.compiler.java
+  org.apache.sling/org.apache.sling.commons.compiler
   org.apache.sling/org.apache.sling.scripting.bundle.tracker
   org.apache.sling/org.apache.sling.scripting.examplebundle
   org.apache.sling/org.apache.sling.scripting.examplebundle.precompiled