introduce new configuration option that disables parsing of dependencies.groovy completely so that only POM data is used. Parsing dependencies.groovy is disabled by default for new applications.

Conflicts:
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/AbstractIvyDependencyManager.java

Author: graemerocher

grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy

@@ -1293,11 +1293,14 @@ class BuildSettings extends AbstractBuildSettings {
                     try {
                         Script script = gcl.parseClass(pluginDependencyDescriptor)?.newInstance()
                         def pluginConfig = pluginSlurper.parse(script)
-                        def pluginDependencyConfig = pluginConfig.grails.project.dependency.resolution
-                        if (pluginDependencyConfig instanceof Closure) {
-                            def excludeRules = pdd ? pdd.getExcludeRules(dependencyManager.configurationNames) : [] as ExcludeRule[]
 
-                            dependencyManager.parseDependencies(pluginName, pluginDependencyConfig, excludeRules)
+                        if(dependencyManager.isLegacyResolve()) {
+                            def pluginDependencyConfig = pluginConfig.grails.project.dependency.resolution
+                            if (pluginDependencyConfig instanceof Closure) {
+                                def excludeRules = pdd ? pdd.getExcludeRules(dependencyManager.configurationNames) : [] as ExcludeRule[]
+
+                                dependencyManager.parseDependencies(pluginName, pluginDependencyConfig, excludeRules)
+                            }
                         }
 
                         def inlinePlugins = getInlinePluginsFromConfiguration(pluginConfig, dir)

grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/AbstractIvyDependencyManager.java

@@ -142,9 +142,10 @@ public abstract class AbstractIvyDependencyManager {
     protected boolean hasApplicationDependencies = false;
     protected boolean readPom = false;
 
-    final protected IvySettings ivySettings;
-    final protected BuildSettings buildSettings;
-    final protected Metadata metadata;
+    protected final IvySettings ivySettings;
+    protected final BuildSettings buildSettings;
+    protected final Metadata metadata;
+    protected boolean legacyResolve = true;
     private boolean offline;
 
     private ChainResolver chainResolver;
@@ -169,6 +170,18 @@ public AbstractIvyDependencyManager(IvySettings ivySettings, BuildSettings build
         updateChangingPattern();
     }
 
+    /**
+     * Whether the legacy approach of parsing dependencies.groovy in addition to pom.xml should be used during dependency resolution
+     *
+     * @return True if it should
+     */
+    public boolean isLegacyResolve() {
+        return legacyResolve;
+    }
+
+    public void setLegacyResolve(boolean legacyResolve) {
+        this.legacyResolve = legacyResolve;
+    }
 
     public ResolveEngine getResolveEngine() {
         return resolveEngine;

grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/PluginInstallEngine.groovy

@@ -464,12 +464,13 @@ You cannot upgrade a plugin that is configured via BuildConfig.groovy, remove th
     }
 
     protected void resolvePluginJarDependencies(fullPluginName, pluginName, pluginInstallPath, Map runtimeDependencies = [:]) {
+        IvyDependencyManager dependencyManager = settings.dependencyManager
+        if(!dependencyManager.isLegacyResolve()) return;
         def pluginDependencyDescriptor = new File("$pluginInstallPath/dependencies.groovy")
         if (pluginDependencyDescriptor.exists() && !settings.isDependenciesExternallyConfigured()) {
             eventHandler "StatusUpdate", "Resolving plugin JAR dependencies"
             def callable = settings.pluginDependencyHandler()
             callable.call(new File("$pluginInstallPath"))
-            IvyDependencyManager dependencyManager = settings.dependencyManager
             dependencyManager.resetGrailsPluginsResolver()
 
             def dependencyConfigurationsToAdd = [IvyDependencyManager.RUNTIME_CONFIGURATION, IvyDependencyManager.BUILD_CONFIGURATION, IvyDependencyManager.PROVIDED_CONFIGURATION]

grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/config/DependencyConfigurationConfigurer.groovy

@@ -31,6 +31,7 @@ class DependencyConfigurationConfigurer extends AbstractDependencyManagementConf
 
     boolean pluginMode = false
     boolean repositoryMode = false
+    boolean legacyResolve = true
 
     DependencyConfigurationConfigurer(DependencyConfigurationContext context) {
         super(context)
@@ -40,6 +41,10 @@ class DependencyConfigurationConfigurer extends AbstractDependencyManagementConf
         dependencyManager.ivySettings.setVariable("ivy.checksums", checksumConfig)
     }
 
+    void legacyResolve(boolean lr) {
+        dependencyManager.setLegacyResolve(lr)
+    }
+
     void checksums(boolean enable) {
         if (!enable) {
             dependencyManager.ivySettings.setVariable("ivy.checksums", "")

grails-resources/src/grails/grails-app/conf/BuildConfig.groovy

@@ -14,6 +14,7 @@ grails.project.dependency.resolution = {
     }
     log "error" // log level of Ivy resolver, either 'error', 'warn', 'info', 'debug' or 'verbose'
     checksums true // Whether to verify checksums on resolve
+    legacyResolve false // whether to do a secondary resolve on plugin installation, not advised and here for backwards compatibility
 
     repositories {
         inherits true // Whether to inherit repository definitions from plugins

grails-resources/src/grails/plugin/grails-app/conf/BuildConfig.groovy

@@ -9,6 +9,7 @@ grails.project.dependency.resolution = {
         // excludes 'ehcache'
     }
     log "warn" // log level of Ivy resolver, either 'error', 'warn', 'info', 'debug' or 'verbose'
+    legacyResolve false // whether to do a secondary resolve on plugin installation, not advised and here for backwards compatibility
     repositories {
         grailsCentral()
         // uncomment the below to enable remote dependency resolution