[sling-org-apache-sling-scripting-groovy] 04/05: SLING-11407 Upgrade to Groovy 4

[olli]

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 c82bf0ec8eca3e66b3258c147bb42ab4e0586cef
Author: Oliver Lietz <o...@apache.org>
AuthorDate: Thu Jun 23 13:33:54 2022 +0200

    SLING-11407 Upgrade to Groovy 4
---
 pom.xml                                                           | 8 ++++----
 .../org/apache/sling/scripting/groovy/it/GroovyTestSupport.java   | 6 +++---
 .../scripting/groovy/it/tests/GStringScriptEngineFactoryIT.java   | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index c1dc7d1..f68645c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
 
   <properties>
     <org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version>
-    <groovy.version>3.0.1</groovy.version>
+    <groovy.version>4.0.3</groovy.version>
   </properties>
 
   <scm>
@@ -165,19 +165,19 @@
     </dependency>
     <!-- Groovy -->
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy</artifactId>
       <version>${groovy.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy-json</artifactId>
       <version>${groovy.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy-templates</artifactId>
       <version>${groovy.version}</version>
       <scope>provided</scope>
diff --git 
a/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java 
b/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java
index 19cdbac..57548cd 100644
--- a/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java
+++ b/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java
@@ -81,9 +81,9 @@ public class GroovyTestSupport extends TestSupport {
             quickstart(),
             // Sling Scripting Groovy
             testBundle("bundle.filename"),
-            
mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy").versionAsInProject(),
-            
mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy-json").versionAsInProject(),
-            
mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy-templates").versionAsInProject(),
+            
mavenBundle().groupId("org.apache.groovy").artifactId("groovy").versionAsInProject(),
+            
mavenBundle().groupId("org.apache.groovy").artifactId("groovy-json").versionAsInProject(),
+            
mavenBundle().groupId("org.apache.groovy").artifactId("groovy-templates").versionAsInProject(),
             // testing
             slingResourcePresence(),
             
mavenBundle().groupId("org.jsoup").artifactId("jsoup").versionAsInProject(),
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 ac1e8ba..41e3c44 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("3.0."));
+        assertThat(scriptEngineFactory.getLanguageVersion(), 
startsWith("4.0."));
     }
 
     @Test