Revert "introduce new configuration option that disables parsing of d…

…ependencies.groovy completely so that only POM data is used. Parsing dependencies.groovy is disabled by default for new applications."

This reverts commit 56ff6d2.

This revert is temporary as we troubleshoot issues with the build server.

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

@@ -1342,14 +1342,11 @@ 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[]
 
-                        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)
-                            }
+                            dependencyManager.parseDependencies(pluginName, pluginDependencyConfig, excludeRules)
                         }
 
                         def inlinePlugins = getInlinePluginsFromConfiguration(pluginConfig, dir)

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

@@ -145,7 +145,6 @@ public abstract class AbstractIvyDependencyManager {
     protected final IvySettings ivySettings;
     protected final BuildSettings buildSettings;
     protected final Metadata metadata;
-    protected boolean legacyResolve = true;
     private boolean offline;
 
     private ChainResolver chainResolver;
@@ -169,19 +168,6 @@ 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

@@ -468,13 +468,12 @@ 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,7 +31,6 @@ class DependencyConfigurationConfigurer extends AbstractDependencyManagementConf
 
     boolean pluginMode = false
     boolean repositoryMode = false
-    boolean legacyResolve = true
 
     DependencyConfigurationConfigurer(DependencyConfigurationContext context) {
         super(context)
@@ -41,10 +40,6 @@ 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

@@ -19,7 +19,6 @@ 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,7 +9,6 @@ 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