Apache Groovy 4 compiler improvements

grails · Aug 10, 2022 · b59815b · b59815b
1 parent 31fde6e
commit b59815b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
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
@@ -102,7 +102,7 @@ class GroovyPageCompiler {
             compilerConfig.setSourceEncoding(encoding)
             ExecutorService threadPool = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()*2)
             CompletionService completionService = new ExecutorCompletionService(threadPool);
-            List<Future<Map>> futures = []
+            List<Future<?>> futures = []
             try {
                 Integer collationLevel = Runtime.getRuntime().availableProcessors()*2
                 if(srcFiles.size() < collationLevel) {

diff --git a/...eb-gsp/src/test/groovy/org/grails/web/gsp/io/GrailsConventionGroovyPageLocatorSpec.groovy b/...eb-gsp/src/test/groovy/org/grails/web/gsp/io/GrailsConventionGroovyPageLocatorSpec.groovy
@@ -5,6 +5,7 @@ import grails.plugins.DefaultGrailsPluginManager
 import grails.plugins.metadata.GrailsPlugin
 import grails.util.GrailsUtil
 import grails.util.GrailsWebMockUtil
+import groovy.xml.XmlSlurper
 import org.grails.core.io.SimpleMapResourceLoader
 import org.grails.gsp.compiler.GroovyPageParser
 import org.grails.gsp.io.GroovyPageCompiledScriptSource