Merge branch '3.2.x' into GRAILS-10032

Author: jameskleeh

.travis.yml

@@ -3,10 +3,6 @@ sudo: false
 jdk:
 - oraclejdk7
 env:
-  matrix:
-  - GRADLE_FLAGS="--stacktrace " GRADLE_CMD="test -x grails-test-suite-web:test"
-  - GRADLE_FLAGS="--stacktrace" GRADLE_CMD="grails-test-suite-web:test"
-  - GRADLE_FLAGS="--stacktrace --info" GRADLE_CMD="integrationTest"
   global:
   - TERM=dumb
   - MALLOC_ARENA_MAX=1
@@ -34,13 +30,8 @@ install: /bin/true
 script:
 - ./travis-build.sh
 after_success:
-- python ./travis/travis_after_all.py
-- export $(cat .to_export_back)
-- ./travis-publish-archives.sh
 - ./trigger-dependent-build.sh
 after_failure:
-- python ./travis/travis_after_all.py
-- export $(cat .to_export_back)
 - ./travis-after-failure.sh
 deploy:
   provider: releases

build.gradle

@@ -33,15 +33,15 @@ ext {
     commonsCollectionsVersion = "3.2.1"
     commonsIOVersion = "2.2"
     commonsLangVersion = "2.6"
-    datastoreVersion = "6.0.0.M2"
+    datastoreVersion = "6.0.0.RC2"
     gantVersion = "1.9.6"
     gdocEngineVersion = "1.0.1"
     groovyVersion = System.getenv('CI_GROOVY_VERSION') ?: "2.4.7"
     ivyVersion = "2.3.0"
     jansiVersion = "1.11"
     jlineVersion = "2.12"
     jnaVersion = "4.0.0"
-    slf4jVersion = "1.7.10"
+    slf4jVersion = "1.7.21"
     reactorCoreVersion = '2.0.8.RELEASE'
     reactorVersion = '2.0.7.RELEASE'
 

grails-bom/plugins.properties

@@ -1,15 +1,16 @@
-hibernate4=6.0.0.M2
-hibernate5=6.0.0.M2
-mongodb=6.0.0.M2
-rx-mongodb=6.0.0.M2
-cassandra=6.0.0.M2
-neo4j=6.0.0.M2
+hibernate4=6.0.0.RC2
+hibernate5=6.0.0.RC2
+mongodb=6.0.0.RC2
+rx-gorm-rest-client=1.0.0.RC2
+rx-mongodb=6.0.0.RC2
+cassandra=6.0.0.RC2
+neo4j=6.0.0.RC2
 cache=3.0.3
 asset-pipeline=3.2.1
-asset-pipeline-grails=2.8.2
+asset-pipeline-grails=2.11.1
 scaffolding=3.2.1
 fields=2.1.3
 geb=1.0.2
-views-json=1.1.0.RC1
-views-json-templates=1.1.0.RC1
-views-markup=1.1.0.RC1
+views-json=1.1.0.RC3
+views-json-templates=1.1.0.RC3
+views-markup=1.1.0.RC3

grails-bom/profiles.properties

@@ -1,8 +1,8 @@
-angular=3.2.0.BUILD-SNAPSHOT
-rest-api=3.2.0.BUILD-SNAPSHOT
-rest-api-plugin=3.2.0.BUILD-SNAPSHOT
-base=3.2.0.BUILD-SNAPSHOT
-plugin=3.2.0.BUILD-SNAPSHOT
-web-plugin=3.2.0.BUILD-SNAPSHOT
-web=3.2.0.BUILD-SNAPSHOT
-profile=3.2.0.BUILD-SNAPSHOT
+angular=3.2.0.RC1
+rest-api=3.2.0.RC1
+rest-api-plugin=3.2.0.RC1
+base=3.2.0.RC2
+plugin=3.2.0.RC1
+web-plugin=3.2.0.RC1
+web=3.2.0.RC1
+profile=3.2.0.RC2

grails-core/src/main/groovy/grails/boot/config/GrailsApplicationPostProcessor.groovy

@@ -13,7 +13,7 @@ import grails.spring.BeanBuilder
 import grails.util.Environment
 import grails.util.Holders
 import groovy.transform.CompileStatic
-import groovy.util.logging.Commons
+import groovy.util.logging.Slf4j
 import org.grails.config.NavigableMap
 import org.grails.config.PrefixedMapPropertySource
 import org.grails.config.PropertySourcesConfig
@@ -34,9 +34,12 @@ import org.springframework.context.event.ApplicationContextEvent
 import org.springframework.context.event.ContextClosedEvent
 import org.springframework.context.event.ContextRefreshedEvent
 import org.springframework.core.convert.converter.Converter
+import org.springframework.core.convert.support.ConfigurableConversionService
 import org.springframework.core.env.AbstractEnvironment
 import org.springframework.core.env.ConfigurableEnvironment
 import org.springframework.core.env.EnumerablePropertySource
+import org.springframework.core.io.Resource
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver
 
 /**
  * A {@link BeanDefinitionRegistryPostProcessor} that enhances any ApplicationContext with plugin manager capabilities
@@ -45,7 +48,7 @@ import org.springframework.core.env.EnumerablePropertySource
  * @since 3.0
  */
 @CompileStatic
-@Commons
+@Slf4j
 class GrailsApplicationPostProcessor implements BeanDefinitionRegistryPostProcessor, ApplicationContextAware, ApplicationListener<ApplicationContextEvent> {
     static final boolean RELOADING_ENABLED = Environment.isReloadingAgentEnabled()
 
@@ -109,16 +112,23 @@ class GrailsApplicationPostProcessor implements BeanDefinitionRegistryPostProces
 
     protected void loadApplicationConfig() {
         org.springframework.core.env.Environment environment = applicationContext.getEnvironment()
+        ConfigurableConversionService conversionService = null
         if(environment instanceof ConfigurableEnvironment) {
             if(environment instanceof AbstractEnvironment) {
-                def cs = environment.getConversionService()
-                cs.addConverter(new Converter<NavigableMap.NullSafeNavigator, String>() {
+                conversionService = environment.getConversionService()
+                conversionService.addConverter(new Converter<String, Resource>() {
+                    @Override
+                    public Resource convert(String source) {
+                        return applicationContext.getResource(source);
+                    }
+                });
+                conversionService.addConverter(new Converter<NavigableMap.NullSafeNavigator, String>() {
                     @Override
                     public String convert(NavigableMap.NullSafeNavigator source) {
                         return null;
                     }
                 });
-                cs.addConverter(new Converter<NavigableMap.NullSafeNavigator, Object>() {
+                conversionService.addConverter(new Converter<NavigableMap.NullSafeNavigator, Object>() {
                     @Override
                     public Object convert(NavigableMap.NullSafeNavigator source) {
                         return null;
@@ -138,7 +148,11 @@ class GrailsApplicationPostProcessor implements BeanDefinitionRegistryPostProces
                     }
                 }
             }
-            ((DefaultGrailsApplication)grailsApplication).config = new PropertySourcesConfig(propertySources)
+            def config = new PropertySourcesConfig(propertySources)
+            if(conversionService != null) {
+                config.setConversionService( conversionService )
+            }
+            ((DefaultGrailsApplication)grailsApplication).config = config
         }
     }
 

grails-core/src/main/groovy/org/grails/compiler/injection/GrailsASTUtils.java

@@ -37,6 +37,7 @@
 import org.codehaus.groovy.syntax.Token;
 import org.codehaus.groovy.syntax.Types;
 import org.codehaus.groovy.transform.sc.StaticCompileTransformation;
+import org.codehaus.groovy.transform.trait.Traits;
 import org.grails.io.support.FileSystemResource;
 import org.grails.io.support.Resource;
 import org.springframework.util.StringUtils;
@@ -970,6 +971,16 @@ public static boolean hasAnyAnnotations(final ClassNode classNode, final Class<?
         return false;
     }
 
+    public static boolean removeAnnotation(final MethodNode methodNode, final Class<? extends Annotation> annotationClass) {
+        List<AnnotationNode> annotations = methodNode.getAnnotations(new ClassNode(annotationClass));
+        if (annotations.size() > 0) {
+            methodNode.getAnnotations().removeAll(annotations);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     public static void addMethodIfNotPresent(ClassNode controllerClassNode, MethodNode methodNode) {
         MethodNode existing = controllerClassNode.getMethod(methodNode.getName(), methodNode.getParameters());
         if (existing == null) {
@@ -1490,4 +1501,12 @@ public static URL getSourceUrl(SourceUnit source) {
     public static URL getSourceUrl(ClassNode classNode) {
         return getSourceUrl(classNode.getModule().getContext());
     }
+
+    public static boolean hasParameters(MethodNode methodNode) {
+        return methodNode.getParameters().length > 0;
+    }
+
+    public static boolean isInheritedFromTrait(MethodNode methodNode) {
+        return hasAnnotation(methodNode, Traits.TraitBridge.class);
+    }
 }

grails-core/src/main/groovy/org/grails/core/cfg/GroovyConfigPropertySourceLoader.groovy

@@ -19,7 +19,7 @@ import grails.util.BuildSettings
 import grails.util.Environment
 import grails.util.Metadata
 import groovy.transform.CompileStatic
-import groovy.util.logging.Commons
+import groovy.util.logging.Slf4j
 import org.grails.config.NavigableMap
 import org.grails.config.NavigableMapPropertySource
 import org.grails.core.exceptions.GrailsConfigurationException
@@ -35,7 +35,7 @@ import org.springframework.core.io.Resource
  * @since 3.0
  */
 @CompileStatic
-@Commons
+@Slf4j
 class GroovyConfigPropertySourceLoader implements PropertySourceLoader {
 
     final String[] fileExtensions = ['groovy'] as String[]
@@ -46,8 +46,9 @@ class GroovyConfigPropertySourceLoader implements PropertySourceLoader {
     }
 
     PropertySource<?> load(String name, Resource resource, String profile, List<String> filteredKeys) throws IOException {
-        def env = Environment.current.name
-        if(profile == null || env == profile) {
+        // since ConfigSlurper is already environment aware, don't load it twice
+        if(profile == null) {
+            def env = Environment.current.name
 
             if(resource.exists()) {
                 ConfigSlurper configSlurper = env ? new ConfigSlurper(env) : new ConfigSlurper()
@@ -66,6 +67,13 @@ class GroovyConfigPropertySourceLoader implements PropertySourceLoader {
 
                     def propertySource = new NavigableMap()
                     propertySource.merge(configObject, false)
+
+                    Resource runtimeResource = resource.createRelative( resource.filename.replace('application', 'runtime') )
+                    if(runtimeResource.exists()) {
+                        def runtimeConfig = configSlurper.parse( runtimeResource.getURL() )
+                        propertySource.merge(runtimeConfig, false)
+                    }
+
                     return new NavigableMapPropertySource(name, propertySource)
                 } catch (Throwable e) {
                     log.error("Unable to load $resource.filename: $e.message", e)

grails-core/src/main/groovy/org/grails/spring/context/support/MapBasedSmartPropertyOverrideConfigurer.groovy

@@ -60,11 +60,8 @@ class MapBasedSmartPropertyOverrideConfigurer implements BeanFactoryPostProcesso
                     final beanPropertyValue = beanPropertiesMap.get(beanPropertyName)
                     applyPropertyValue(factory, beanName.toString(), beanPropertyName.toString(), beanPropertyValue)
                 }
-
             }
-
         }
-
     }
 
     protected void applyPropertyValue(ConfigurableListableBeanFactory factory, String beanName, String property, Object value) {
@@ -116,15 +113,14 @@ class MapBasedSmartPropertyOverrideConfigurer implements BeanFactoryPostProcesso
     }
 
     protected BeanDefinition getTargetBeanDefinitionForFactoryBean(ConfigurableListableBeanFactory factory,
-            String beanName, BeanDefinition beanDefinition, Class beanClass) {
+            String beanName, BeanDefinition beanDefinition, Class<? extends FactoryBean> beanClass) {
 
         if (TransactionProxyFactoryBean.isAssignableFrom(beanClass)) {
             getTargetBeanDefinition(factory, beanName,
                     (BeanDefinition)beanDefinition.propertyValues.getPropertyValue("target").value)
         }
         else {
-            throw new BeanCreationException(beanName,
-                 "Unable to determine target bean definition for FactoryBeans of type " + beanClass.name)
+            beanDefinition
         }
     }
 }

grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsExtension.groovy

@@ -1,5 +1,6 @@
 package org.grails.gradle.plugin.core
 
+import groovy.transform.CompileStatic
 import org.apache.tools.ant.taskdefs.condition.Os
 import org.gradle.api.Project
 import org.gradle.util.ConfigureUtil
@@ -10,6 +11,7 @@ import org.gradle.util.ConfigureUtil
  * @author Graeme Rocher
  * @since 3.0
  */
+@CompileStatic
 class GrailsExtension {
     Project project
 
@@ -58,7 +60,7 @@ class GrailsExtension {
      */
     void plugins(Closure pluginDefinitions) {
         def definer = new PluginDefiner(project,exploded)
-        ConfigureUtil.configure(pluginDefinitions, definer, Closure.DELEGATE_FIRST)
+        ConfigureUtil.configureSelf(pluginDefinitions, definer)
     }
     /**
      * Configuration for the reloading agent

grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy

@@ -357,10 +357,12 @@ class GrailsGradlePlugin extends GroovyPlugin {
         findMainClass.doLast {
             def bootExtension = project.extensions.findByType(SpringBootPluginExtension)
             def mainClassName = bootExtension.mainClass
-            consoleTask.args mainClassName
-            shellTask.args mainClassName
-            project.tasks.withType(ApplicationContextCommandTask) { ApplicationContextCommandTask task ->
-                task.args mainClassName
+            if(mainClassName) {
+                consoleTask.args mainClassName
+                shellTask.args mainClassName
+                project.tasks.withType(ApplicationContextCommandTask) { ApplicationContextCommandTask task ->
+                    task.args mainClassName
+                }
             }
             project.tasks.withType(ApplicationContextScriptTask) { ApplicationContextScriptTask task ->
                 task.args mainClassName