grails · puneetbehl · Apr 26, 2022 · Aug 26, 2022 · Apr 26, 2022 · Apr 26, 2022
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['8', '11', '14']
+        java: ['11', '14', '17']
     env:
       WORKSPACE: ${{ github.workspace }}
       GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8

diff --git a/.github/workflows/groovy-joint-workflow.yml b/.github/workflows/groovy-joint-workflow.yml
@@ -48,6 +48,9 @@ jobs:
         run: env
 
       # Select correct Groovy branch for this build:
+      - name: Checkout Groovy 4_0_X (Grails 6.0.x)
+        run: cd .. && git clone --depth 1 https://github.com/apache/groovy.git -b GROOVY_4_0_X --single-branch
+        if: github.ref == 'refs/heads/6.0.x' || github.base_ref == '6.0.x'
       - name: Checkout Groovy 3_0_X (Grails 4.1.x)
         run: cd .. && git clone --depth 1 https://github.com/apache/groovy.git -b GROOVY_3_0_X --single-branch
         if: github.ref == 'refs/heads/5.2.x' || github.base_ref == '5.2.x' || github.ref == 'refs/heads/5.1.x' || github.base_ref == '5.1.x' || github.ref == 'refs/heads/5.0.x' || github.base_ref == '5.0.x' || github.ref == 'refs/heads/master' || github.base_ref == 'master'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['8']
+        java: ['11']
     env:
       GIT_USER_NAME: puneetbehl
       GIT_USER_EMAIL: behlp@objectcomputing.com

diff --git a/build.gradle b/build.gradle
@@ -91,7 +91,7 @@ ext {
         ],
         groovy: [
             version: groovyVersion,
-            group  : 'org.codehaus.groovy',
+            group  : 'org.apache.groovy',
             names  : ['groovy'],
             modules: ['', 'xml', 'swing', 'console', 'json', 'ant', 'sql', 'templates', 'nio', 'dateutil', 'macro']
         ],
@@ -196,7 +196,7 @@ if (jointBuildGroovyJarProperty) {
         throw new GradleException("The groovy.jar system property points to ${jointBuildGroovyJar.absolutePath} which does not exist.")
     }
 } else {
-    groovyDependency = dependencies.create("org.codehaus.groovy:groovy:${groovyVersion}") {
+    groovyDependency = dependencies.create("org.apache.groovy:groovy:${groovyVersion}") {
         exclude module:"commons-cli"
         exclude module:"ant"
     }
@@ -247,12 +247,16 @@ allprojects {
                 cacheChangingModulesFor cacheHours, 'hours'
                 eachDependency { DependencyResolveDetails details ->
                     //specifying a fixed version for all libraries with 'org.gradle' group
-                    if (details.requested.group == 'org.codehaus.groovy') {
+                    if (details.requested.group == 'org.apache.groovy') {
                         details.useVersion groovyVersion
                     }
                     if (details.requested.group == "org.spockframework") {
                         details.useVersion(spockVersion)
                     }
+                    if (details.requested.group == 'org.codehaus.groovy') {
+                        details.useTarget(group: "org.apache.groovy", name: details.requested.name, version: groovyVersion)
+                        details.because "The dependency coordinates are changed in Apache Groovy 4"
+                    }
                 }
             }
         }
@@ -418,8 +422,12 @@ subprojects { project ->
     if(project.name == 'grails-dependencies') return
     if(project.name == 'grails-bom') return
 
-    sourceCompatibility = "1.8"
-    targetCompatibility = "1.8"
+    sourceCompatibility = 1.11
+    targetCompatibility = 1.11
+
+    java {
+        disableAutoTargetJvm()
+    }
 
     if(project.name =~ /^(grails-web|grails-plugin-|grails-test-suite|grails-test)/) {
         dependencies {
@@ -479,13 +487,15 @@ subprojects { project ->
     dependencies {
         documentation("org.fusesource.jansi:jansi:$jansiVersion")
         documentation("jline:jline:$jlineVersion")
-        documentation "org.codehaus.groovy:groovy-ant:$groovyVersion"
-        documentation "org.codehaus.groovy:groovy-cli-picocli:$groovyVersion"
+        documentation "org.apache.groovy:groovy-ant:$groovyVersion"
+        documentation "org.apache.groovy:groovy-cli-picocli:$groovyVersion"
         documentation ("com.github.javaparser:javaparser-core:$javaParserCoreVersion")
 
+        api platform("org.apache.groovy:groovy-bom:$groovyVersion")
+        annotationProcessor platform("org.apache.groovy:groovy-bom:$groovyVersion")
         api groovyDependency
 
-        testImplementation "org.codehaus.groovy:groovy-test-junit5:${groovyVersion}"
+        testImplementation "org.apache.groovy:groovy-test-junit5:${groovyVersion}"
         testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.0"
         testImplementation "org.junit.platform:junit-platform-runner:1.9.0"
         testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.0"

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-projectVersion=5.2.4-SNAPSHOT
+projectVersion=6.0.0-SNAPSHOT
 antVersion=1.10.12
 aspectjVersion=1.9.9.1
 asyncVersion=4.0.0
@@ -11,7 +11,7 @@ gdocEngineVersion=1.0.1
 gradleNexusPluginVersion=2.3.1
 gradleNexusStagingPluginVersion=0.12.0
 gradleSdkVendorVersion=1.2.1
-groovyVersion=3.0.11
+groovyVersion=4.0.4
 gspVersion=5.2.1
 h2.version=1.4.199
 h2Version=1.4.200

diff --git a/gradle/docs.gradle b/gradle/docs.gradle
@@ -14,7 +14,7 @@ configurations {
 }
 
 dependencies {
-    documentation "org.codehaus.groovy:groovy-groovydoc:$groovyVersion"
+    documentation "org.apache.groovy:groovy-groovydoc:$groovyVersion"
 }
 
 task stubs {
@@ -23,7 +23,7 @@ task stubs {
         def isolatedAnt = services.get(org.gradle.api.internal.project.IsolatedAntBuilder)
         isolatedAnt.execute {
             mkdir(dir: destinationDir)
-            taskdef(name: "generatestubs", classname: "org.codehaus.groovy.grails.cli.GenerateStubsTask") {
+            taskdef(name: "generatestubs", classname: "org.apache.groovy.grails.cli.GenerateStubsTask") {
                 classpath {
                     for(sub in subprojects) {
                         pathelement path: sub.sourceSets.main.compileClasspath.asPath

diff --git a/grails-bom/build.gradle b/grails-bom/build.gradle
@@ -61,7 +61,7 @@ publishing {
                                                 mkp.artifactId 'jna'
                                             }
                                             mkp.exclusion {
-                                                mkp.groupId 'org.codehaus.groovy'
+                                                mkp.groupId 'org.apache.groovy'
                                                 mkp.artifactId 'groovy-ant'
                                             }
                                         }

diff --git a/grails-bootstrap/build.gradle b/grails-bootstrap/build.gradle
@@ -1,8 +1,8 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
 dependencies {
-    api ( "org.codehaus.groovy:groovy-xml:$groovyVersion" )
-    api ( "org.codehaus.groovy:groovy-templates:$groovyVersion" )
+    api ( "org.apache.groovy:groovy-xml:$groovyVersion" )
+    api ( "org.apache.groovy:groovy-templates:$groovyVersion" )
     api "org.yaml:snakeyaml:1.30"
     api "io.micronaut:micronaut-inject:$micronautVersion"
 
@@ -12,7 +12,7 @@ dependencies {
     compileOnly("net.java.dev.jna:jna:$jnaVersion")
 
     // Ant
-    compileOnly "org.codehaus.groovy:groovy-ant:$groovyVersion"
+    compileOnly "org.apache.groovy:groovy-ant:$groovyVersion"
 
     testImplementation("org.fusesource.jansi:jansi:$jansiVersion")
     testImplementation("jline:jline:$jlineVersion")

diff --git a/grails-bootstrap/src/main/groovy/grails/util/GrailsNameUtils.java b/grails-bootstrap/src/main/groovy/grails/util/GrailsNameUtils.java
@@ -627,6 +627,7 @@ static String convertValidPropertyMethodSuffix(String suffix) {
      * @return true if it is a javabean property getter
      * @deprecated use {@link #isGetter(String, Class, Class[])} instead because this method has a defect for "is.." method with Boolean return types.
      */
+    @Deprecated
     public static boolean isGetter(String name, Class<?>[] args) {
         return isGetter(name, boolean.class, args);
     }

diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/SpringIOUtils.java b/grails-bootstrap/src/main/groovy/org/grails/io/support/SpringIOUtils.java
@@ -15,7 +15,7 @@
  */
 package org.grails.io.support;
 
-import groovy.util.XmlSlurper;
+import groovy.xml.XmlSlurper;
 import groovy.xml.FactorySupport;
 import org.xml.sax.SAXException;
 import javax.xml.XMLConstants;

diff --git a/grails-console/build.gradle b/grails-console/build.gradle
@@ -1,8 +1,8 @@
 dependencies {
     api project(":grails-core")
-    api "org.codehaus.groovy:groovy-console:$groovyVersion"
-    api "org.codehaus.groovy:groovy-swing:$groovyVersion"
-    api "org.codehaus.groovy:groovy-groovysh:$groovyVersion"
+    api "org.apache.groovy:groovy-console:$groovyVersion"
+    api "org.apache.groovy:groovy-swing:$groovyVersion"
+    api "org.apache.groovy:groovy-groovysh:$groovyVersion"
     implementation "org.fusesource.jansi:jansi:$jansiVersion",
             "jline:jline:$jlineVersion",
             "net.java.dev.jna:jna:$jnaVersion"

diff --git a/grails-console/src/main/groovy/grails/ui/shell/support/GroovyshApplicationContext.groovy b/grails-console/src/main/groovy/grails/ui/shell/support/GroovyshApplicationContext.groovy
@@ -17,7 +17,7 @@ package grails.ui.shell.support
 
 import grails.core.GrailsApplication
 import grails.ui.support.DevelopmentWebApplicationContext
-import org.codehaus.groovy.tools.shell.Groovysh
+import org.apache.groovy.groovysh.Groovysh
 import org.codehaus.groovy.tools.shell.IO
 import org.springframework.context.support.GenericApplicationContext
 

diff --git a/grails-console/src/main/groovy/grails/ui/shell/support/GroovyshWebApplicationContext.groovy b/grails-console/src/main/groovy/grails/ui/shell/support/GroovyshWebApplicationContext.groovy
@@ -19,7 +19,7 @@ import grails.core.GrailsApplication
 import grails.ui.support.DevelopmentWebApplicationContext
 import groovy.transform.CompileStatic
 import groovy.transform.InheritConstructors
-import org.codehaus.groovy.tools.shell.Groovysh
+import org.apache.groovy.groovysh.Groovysh
 import org.codehaus.groovy.tools.shell.IO
 
 

diff --git a/grails-core/build.gradle b/grails-core/build.gradle
@@ -1,7 +1,9 @@
 dependencies {
     compileOnly "io.micronaut:micronaut-inject-java:$micronautVersion"
     compileOnly "io.micronaut:micronaut-inject-groovy:$micronautVersion"
-    compileOnly "io.micronaut.spring:micronaut-spring-annotation:$micronautSpringVersion"
+    compileOnly ("io.micronaut.spring:micronaut-spring-annotation:$micronautSpringVersion") {
+        exclude group: "org.codehaus.groovy", module: "groovy-bom"
+    }
     compileOnly "io.micronaut.cache:micronaut-cache-core:$micronautCacheVersion"
     compileOnly "io.micronaut:micronaut-runtime:$micronautVersion"
     compileOnly "org.aspectj:aspectjrt:$aspectjVersion",
@@ -39,16 +41,15 @@ dependencies {
     compileOnly("org.springframework:spring-test:${springVersion}") {
         exclude group: 'commons-logging', module:'commons-logging'
     }
-    compileOnly("org.codehaus.groovy:groovy-templates:$groovyVersion")
-
+    compileOnly("org.apache.groovy:groovy-templates:$groovyVersion")
 
     api project(":grails-bootstrap"), {
         exclude group:"org.fusesource.jansi", module:"jansi"
         exclude group:"jline", module:"jline"
         exclude group:"net.java.dev.jna", module:"jna"
 
         // Ant
-        exclude group:"org.codehaus.groovy", module:"groovy-ant"
+        exclude group:"org.apache.groovy", module:"groovy-ant"
         exclude group:"org.apache.ant", module:"ant"
         exclude group:"org.apache.ant", module:"ant-launcher"
         exclude group:"org.apache.ivy", module:"ivy"

diff --git a/grails-core/src/main/groovy/grails/util/GrailsUtil.java b/grails-core/src/main/groovy/grails/util/GrailsUtil.java
@@ -19,7 +19,7 @@
 import groovy.lang.Binding;
 import groovy.lang.GroovyShell;
 import groovy.lang.Writable;
-import groovy.util.slurpersupport.GPathResult;
+import groovy.xml.slurpersupport.GPathResult;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.grails.core.io.CachingPathMatchingResourcePatternResolver;

diff --git a/.../main/groovy/org/grails/compiler/injection/GlobalGrailsClassInjectorTransformation.groovy b/.../main/groovy/org/grails/compiler/injection/GlobalGrailsClassInjectorTransformation.groovy
@@ -11,7 +11,8 @@ import grails.util.GrailsUtil
 import groovy.transform.CompilationUnitAware
 import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
-import groovy.util.slurpersupport.GPathResult
+import groovy.xml.XmlSlurper
+import groovy.xml.slurpersupport.GPathResult
 import groovy.xml.MarkupBuilder
 import groovy.xml.StreamingMarkupBuilder
 import org.codehaus.groovy.ast.*
@@ -221,7 +222,7 @@ class GlobalGrailsClassInjectorTransformation implements ASTTransformation, Comp
 
     protected static void generatePluginXml(ClassNode pluginClassNode, String pluginVersion, Set<String> transformedClasses, File pluginXmlFile) {
         def pluginXmlExists = pluginXmlFile.exists()
-        Set pluginClasses = []
+        Set<String> pluginClasses = []
         pluginClasses.addAll(transformedClasses)
         pluginClasses.addAll(pendingPluginClasses)
 

diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/GrailsAwareInjectionOperation.java b/grails-core/src/main/groovy/org/grails/compiler/injection/GrailsAwareInjectionOperation.java
@@ -120,7 +120,7 @@ private static void initializeState() {
                     final ClassReader classReader = new ClassReader(inputStream);
                     final String astTransformerClassName = AstTransformer.class.getSimpleName();
                     final ClassLoader finalClassLoader = classLoader;
-                    classReader.accept(new ClassVisitor(Opcodes.ASM4) {
+                    classReader.accept(new ClassVisitor(Opcodes.ASM7) {
                         @Override
                         public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
                             try {

diff --git a/grails-core/src/main/groovy/org/grails/plugins/BinaryGrailsPluginDescriptor.java b/grails-core/src/main/groovy/org/grails/plugins/BinaryGrailsPluginDescriptor.java
@@ -15,7 +15,7 @@
  */
 package org.grails.plugins;
 
-import groovy.util.slurpersupport.GPathResult;
+import groovy.xml.slurpersupport.GPathResult;
 import org.grails.core.exceptions.GrailsConfigurationException;
 import org.grails.io.support.SpringIOUtils;
 import org.springframework.core.io.Resource;

diff --git a/grails-databinding/build.gradle b/grails-databinding/build.gradle
@@ -1,4 +1,4 @@
 dependencies {
-    api "org.codehaus.groovy:groovy-xml:$groovyVersion"
+    api "org.apache.groovy:groovy-xml:$groovyVersion"
 }
 
diff --git a/grails-databinding/src/main/groovy/grails/databinding/DataBinder.java b/grails-databinding/src/main/groovy/grails/databinding/DataBinder.java
@@ -16,7 +16,7 @@
 package grails.databinding;
 
 import grails.databinding.events.DataBindingListener;
-import groovy.util.slurpersupport.GPathResult;
+import groovy.xml.slurpersupport.GPathResult;
 
 import java.util.List;
 

diff --git a/grails-databinding/src/main/groovy/grails/databinding/SimpleDataBinder.groovy b/grails-databinding/src/main/groovy/grails/databinding/SimpleDataBinder.groovy
@@ -21,7 +21,7 @@ import grails.databinding.events.DataBindingListener
 import grails.databinding.initializers.ValueInitializer
 import groovy.transform.CompileStatic
 import groovy.transform.TypeCheckingMode
-import groovy.util.slurpersupport.GPathResult
+import groovy.xml.slurpersupport.GPathResult
 import org.grails.databinding.ClosureValueConverter
 import org.grails.databinding.ClosureValueInitializer
 import org.grails.databinding.IndexedPropertyReferenceDescriptor

diff --git a/grails-databinding/src/main/groovy/grails/databinding/SimpleMapDataBindingSource.groovy b/grails-databinding/src/main/groovy/grails/databinding/SimpleMapDataBindingSource.groovy
@@ -20,7 +20,7 @@ import groovy.transform.CompileStatic
 @CompileStatic
 class SimpleMapDataBindingSource implements DataBindingSource {
 
-    protected Map map
+    protected Map<String, ?> map
     boolean dataSourceAware = true
 
     SimpleMapDataBindingSource(Map map) {

diff --git a/.../src/main/groovy/org/grails/databinding/xml/GPathResultCollectionDataBindingSource.groovy b/.../src/main/groovy/org/grails/databinding/xml/GPathResultCollectionDataBindingSource.groovy
@@ -19,7 +19,7 @@ import grails.databinding.CollectionDataBindingSource;
 import grails.databinding.DataBindingSource;
 import grails.databinding.SimpleMapDataBindingSource;
 import groovy.transform.CompileStatic
-import groovy.util.slurpersupport.GPathResult
+import groovy.xml.slurpersupport.GPathResult
 
 @CompileStatic
 class GPathResultCollectionDataBindingSource implements CollectionDataBindingSource {

diff --git a/grails-databinding/src/main/groovy/org/grails/databinding/xml/GPathResultMap.groovy b/grails-databinding/src/main/groovy/org/grails/databinding/xml/GPathResultMap.groovy
@@ -15,9 +15,9 @@
  */
 package org.grails.databinding.xml
 
-import groovy.util.slurpersupport.GPathResult
-import groovy.util.slurpersupport.Node
-import groovy.util.slurpersupport.NodeChild
+import groovy.xml.slurpersupport.GPathResult
+import groovy.xml.slurpersupport.Node
+import groovy.xml.slurpersupport.NodeChild
 
 /**
  * @author Jeff Brown

diff --git a/grails-dependencies/build.gradle b/grails-dependencies/build.gradle
@@ -31,7 +31,7 @@ publishing {
                                     delegate.artifactId 'jna'
                                 }
                                 delegate.exclusion {
-                                    delegate.groupId 'org.codehaus.groovy'
+                                    delegate.groupId 'org.apache.groovy'
                                     delegate.artifactId 'groovy-ant'
                                 }
                             }

diff --git a/grails-docs/build.gradle b/grails-docs/build.gradle
@@ -10,7 +10,7 @@ dependencies {
             "org.apache.ant:ant:$antVersion",
             'org.grails:grails-gdoc-engine:1.0.1',
             'org.yaml:snakeyaml:1.30',
-            "org.codehaus.groovy:groovy-ant:$groovyVersion"
+            "org.apache.groovy:groovy-ant:$groovyVersion"
 
     api 'org.asciidoctor:asciidoctorj:2.5.5'
     api('org.xhtmlrenderer:core-renderer:8.0') {

diff --git a/grails-encoder/build.gradle b/grails-encoder/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
     api project(":grails-core")
     // HtmlUtils is used from spring-web
-    api "org.codehaus.groovy:groovy-json:$groovyVersion"
+    api "org.apache.groovy:groovy-json:$groovyVersion"
     api "org.springframework:spring-web:${springVersion}"
 }
diff --git a/...in-controllers/src/main/groovy/grails/artefact/controller/support/ResponseRenderer.groovy b/...in-controllers/src/main/groovy/grails/artefact/controller/support/ResponseRenderer.groovy
@@ -27,7 +27,7 @@ import grails.web.mime.MimeUtility
 import groovy.json.StreamingJsonBuilder
 import groovy.transform.CompileStatic
 import groovy.transform.Generated
-import groovy.util.slurpersupport.GPathResult
+import groovy.xml.slurpersupport.GPathResult
 import groovy.xml.StreamingMarkupBuilder
 import org.grails.gsp.GroovyPageTemplate
 import org.grails.io.support.SpringIOUtils

diff --git a/grails-plugin-datasource/build.gradle b/grails-plugin-datasource/build.gradle
@@ -3,7 +3,7 @@ dependencies {
         exclude group: 'commons-logging', module:'commons-logging'
     }
 
-    api "org.codehaus.groovy:groovy-sql:$groovyVersion"
+    api "org.apache.groovy:groovy-sql:$groovyVersion"
 
     api("org.springframework:spring-context:${springVersion}") {
         exclude group: 'commons-logging', module:'commons-logging'

diff --git a/grails-plugin-i18n/build.gradle b/grails-plugin-i18n/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
     api project(":grails-web")
 
-    api "org.codehaus.groovy:groovy-ant:$groovyVersion"
+    api "org.apache.groovy:groovy-ant:$groovyVersion"
 }