You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2020/03/11 20:12:51 UTC

[sling-org-apache-sling-scripting-groovy] branch master updated (467bbef -> 1bf0919)

This is an automated email from the ASF dual-hosted git repository.

olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git.


    from 467bbef  SLING-9116 Update Pax Exam to 4.13.2
     new 4280df9  SLING-9198 Update to Sling Bundle Parent 38
     new 1bf0919  SLING-9199 Upgrade Groovy to 3.0

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                                             | 6 +++---
 .../scripting/groovy/it/tests/GStringScriptEngineFactoryIT.java     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)


[sling-org-apache-sling-scripting-groovy] 02/02: SLING-9199 Upgrade Groovy to 3.0

Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git

commit 1bf09192da03f17f702fb3a2dd90c6c9b7494e09
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Mar 11 21:11:12 2020 +0100

    SLING-9199 Upgrade Groovy to 3.0
---
 pom.xml                                                               | 4 ++--
 .../sling/scripting/groovy/it/tests/GStringScriptEngineFactoryIT.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index e8e6159..7c56886 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
   </parent>
 
   <artifactId>org.apache.sling.scripting.groovy</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
 
   <name>Apache Sling Scripting Groovy</name>
   <description>Support for scripting with Groovy</description>
@@ -39,7 +39,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <sling.java.version>8</sling.java.version>
     <org.ops4j.pax.exam.version>4.13.2</org.ops4j.pax.exam.version>
-    <groovy.version>2.5.0</groovy.version>
+    <groovy.version>3.0.1</groovy.version>
   </properties>
 
   <scm>
diff --git a/src/test/java/org/apache/sling/scripting/groovy/it/tests/GStringScriptEngineFactoryIT.java b/src/test/java/org/apache/sling/scripting/groovy/it/tests/GStringScriptEngineFactoryIT.java
index d242c3f..52f7e51 100644
--- a/src/test/java/org/apache/sling/scripting/groovy/it/tests/GStringScriptEngineFactoryIT.java
+++ b/src/test/java/org/apache/sling/scripting/groovy/it/tests/GStringScriptEngineFactoryIT.java
@@ -61,7 +61,7 @@ public class GStringScriptEngineFactoryIT extends GroovyTestSupport {
 
     @Test
     public void testScriptEngineFactoryLanguageVersion() {
-        assertThat(scriptEngineFactory.getLanguageVersion(), startsWith("2.5."));
+        assertThat(scriptEngineFactory.getLanguageVersion(), startsWith("3.0."));
     }
 
     @Test


[sling-org-apache-sling-scripting-groovy] 01/02: SLING-9198 Update to Sling Bundle Parent 38

Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git

commit 4280df9c384ce1de62cfa62ac3a41c3bf76ff30a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Mar 11 21:08:52 2020 +0100

    SLING-9198 Update to Sling Bundle Parent 38
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 30a73c6..e8e6159 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.sling</groupId>
     <artifactId>sling-bundle-parent</artifactId>
-    <version>35</version>
+    <version>38</version>
     <relativePath />
   </parent>