Merge pull request #13868 from jdaugherty/feature/7.0.0/13867-delegate-resolution

Author: jdaugherty

grails-core/src/main/groovy/org/grails/plugins/DefaultGrailsPlugin.java

@@ -541,12 +541,9 @@ public void doWithRuntimeConfiguration(RuntimeSpringConfiguration springConfig)
                 BeanBuilder bb = new BeanBuilder(getParentCtx(),springConfig, grailsApplication.getClassLoader());
                 bb.setBinding(b);
                 c.setDelegate(bb);
-                c.setResolveStrategy(Closure.OWNER_FIRST);
                 bb.invokeMethod("beans", new Object[]{c});
             }
-        }
-        else {
-
+        } else {
             if (!pluginBean.isReadableProperty(DO_WITH_SPRING)) {
                 return;
             }
@@ -559,7 +556,6 @@ public void doWithRuntimeConfiguration(RuntimeSpringConfiguration springConfig)
             BeanBuilder bb = new BeanBuilder(getParentCtx(),springConfig, grailsApplication.getClassLoader());
             bb.setBinding(b);
             c.setDelegate(bb);
-            c.setResolveStrategy(Closure.DELEGATE_FIRST);
             bb.invokeMethod("beans", new Object[]{c});
         }