Merge branch '3.1.x'

Author: Graeme Rocher

grails-bom/plugins.properties

@@ -11,5 +11,5 @@ asset-pipeline-grails=2.8.2
 scaffolding=3.2.1
 fields=2.1.2
 geb=1.0.1
-views-json=1.0.11
-views-markup=1.0.11
+views-json=1.0.12
+views-markup=1.0.12

grails-bootstrap/src/main/groovy/org/grails/config/CodeGenConfig.groovy

@@ -38,6 +38,8 @@ import org.yaml.snakeyaml.Yaml
 class CodeGenConfig implements Cloneable, ConfigMap {
     final NavigableMap configMap
 
+    GroovyClassLoader groovyClassLoader = new GroovyClassLoader(CodeGenConfig.getClassLoader())
+
     CodeGenConfig() {
         configMap = new NavigableMap()
     }
@@ -142,6 +144,7 @@ class CodeGenConfig implements Cloneable, ConfigMap {
         if(groovyConfig.exists()) {
             def envName = Environment.current.name
             def configSlurper = new ConfigSlurper(envName)
+            configSlurper.classLoader = groovyClassLoader
             def configObject = configSlurper.parse(groovyConfig.toURI().toURL())
             mergeMap(configObject, false)
         }

grails-gsp/src/main/groovy/org/grails/gsp/compiler/GroovyPageCompiler.groovy

@@ -71,6 +71,7 @@ class GroovyPageCompiler {
 
             if(configs) {
                 def codeGenConfig = new CodeGenConfig()
+                codeGenConfig.classLoader = classLoader
                 configMap = codeGenConfig
                 for(path in configs) {
                     def f = new File(path)