Merge branch '3.1.x' into 3.2.x

Author: graemerocher

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

@@ -82,6 +82,7 @@ class GrailsApplicationPostProcessor implements BeanDefinitionRegistryPostProces
         if(applicationContext == null) {
             throw new IllegalStateException("ApplicationContext should not be null")
         }
+        Environment.setInitializing(true)
         grailsApplication.applicationContext = applicationContext
         grailsApplication.mainContext = applicationContext
         customizePluginManager(pluginManager)
@@ -236,6 +237,7 @@ class GrailsApplicationPostProcessor implements BeanDefinitionRegistryPostProces
 
         def lifeCycleBeans = context.getBeansOfType(GrailsApplicationLifeCycle).values()
         if(event instanceof ContextRefreshedEvent) {
+            Environment.setInitializing(false)
             pluginManager.setApplicationContext(context)
             pluginManager.doDynamicMethods()
             for(GrailsApplicationLifeCycle lifeCycle in lifeCycleBeans) {

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

@@ -84,7 +84,9 @@ class GrailsGradlePlugin extends GroovyPlugin {
 
     @CompileStatic
     void apply(Project project) {
-        super.apply(project)
+        if( project.tasks.findByName('compileGroovy') == null ) {
+            super.apply(project)
+        }
 
         configureProfile(project)
 

grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/api/ControllersDomainBindingApi.java

@@ -20,6 +20,7 @@
 import grails.core.GrailsApplication;
 import grails.core.GrailsDomainClass;
 import grails.core.GrailsDomainClassProperty;
+import grails.util.Environment;
 import grails.util.GrailsMetaClassUtils;
 import grails.util.Holders;
 import grails.web.databinding.DataBindingUtils;
@@ -90,13 +91,16 @@ private static GrailsDomainClass getDomainClass(Object instance) {
     }
 
     private static void autowire(Object instance) {
-        final ApplicationContext applicationContext = Holders.findApplicationContext();
-        final Config config = Holders.getConfig();
-        boolean autowire = config != null ? config.getProperty(Settings.GORM_AUTOWIRE_INSTANCES, Boolean.class, true) : true;
-        if(autowire && applicationContext != null) {
-            applicationContext
-                    .getAutowireCapableBeanFactory()
-                    .autowireBeanProperties(instance, AutowireCapableBeanFactory.AUTOWIRE_BY_NAME, false);
+        if(!Environment.isInitializing()) {
+
+            final ApplicationContext applicationContext = Holders.findApplicationContext();
+            final Config config = Holders.getConfig();
+            boolean autowire = config != null ? config.getProperty(Settings.GORM_AUTOWIRE_INSTANCES, Boolean.class, true) : true;
+            if(autowire && applicationContext != null ) {
+                applicationContext
+                        .getAutowireCapableBeanFactory()
+                        .autowireBeanProperties(instance, AutowireCapableBeanFactory.AUTOWIRE_BY_NAME, false);
+            }
         }
     }
 }