diff --git a/gradle.properties b/gradle.properties
index 876886c794..fc5e19336c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ githubBranch=6.1.x
 developers=Puneet Behl, Graeme Rocher
 grailsGradlePluginVersion=6.1.0
 grailsVersion=6.1.0
-groovyVersion=3.0.11
+groovyVersion=3.0.19
 servletApiVersion=4.0.1
 javaParserCoreVersion=3.15.14
 jansiVersion=1.18
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/compiler/GroovyPageCompiler.groovy b/grails-gsp/src/main/groovy/org/grails/gsp/compiler/GroovyPageCompiler.groovy
index 2094afafb5..46209a6ca0 100644
--- a/grails-gsp/src/main/groovy/org/grails/gsp/compiler/GroovyPageCompiler.groovy
+++ b/grails-gsp/src/main/groovy/org/grails/gsp/compiler/GroovyPageCompiler.groovy
@@ -112,9 +112,9 @@ class GroovyPageCompiler {
                 for(int index = 0; index < collatedSrcFiles.size(); index++) {        
                     def gspFiles = collatedSrcFiles[index]
                     
-                    futures << completionService.submit({ ->
+                    futures.add(completionService.submit({ ->
                         def results = [:]
-                        for(int gspIndex=0;gspIndex < gspFiles.size();gspIndex++) {
+                        for(int gspIndex = 0; gspIndex < gspFiles.size(); gspIndex++) {
                             File gsp = gspFiles[gspIndex]
                             try {
                                 compileGSP(viewsDir, gsp, viewPrefix, packagePrefix, results)    
@@ -124,7 +124,7 @@ class GroovyPageCompiler {
                             }
                         }
                         return results 
-                    } as Callable)
+                    } as Callable) as Future<Map>)
                 }
 
                 int pending = futures.size()
diff --git a/grails-web-gsp/src/main/groovy/org/grails/web/pages/GroovyPageCompilerForkTask.groovy b/grails-web-gsp/src/main/groovy/org/grails/web/pages/GroovyPageCompilerForkTask.groovy
index 9c458558f5..cca4668846 100644
--- a/grails-web-gsp/src/main/groovy/org/grails/web/pages/GroovyPageCompilerForkTask.groovy
+++ b/grails-web-gsp/src/main/groovy/org/grails/web/pages/GroovyPageCompilerForkTask.groovy
@@ -116,7 +116,7 @@ Usage: java -cp CLASSPATH GroovyPageCompilerForkTask [srcDir] [destDir] [tmpDir]
         String targetCompatibility = args[3]
         String packageName = args[4].trim()
         String serverpath = args[5]
-        String[] configFiles = args[6].tokenize(',')
+        String[] configFiles = args[6].tokenize(',') as String[]
         File configFile = new File(args[6])
         String encoding = args[7] ?: 'UTF-8'