Remove DepencencyManagementPlugin

Issue gh-9540

Author: rwinch

build.gradle

@@ -24,8 +24,6 @@ ext.snapshotBuild = version.contains("SNAPSHOT")
 ext.releaseBuild = version.contains("SNAPSHOT")
 ext.milestoneBuild = !(snapshotBuild || releaseBuild)
 
-dependencyManagementExport.projects = subprojects.findAll { !it.name.contains('-boot') }
-
 repositories {
 	mavenCentral()
 }

buildSrc/build.gradle

@@ -21,6 +21,10 @@ gradlePlugin {
 			id = "locks"
 			implementationClass = "lock.GlobalLockPlugin"
 		}
+		managementConfiguration {
+			id = "io.spring.convention.management-configuration"
+			implementationClass = "io.spring.gradle.convention.ManagementConfigurationPlugin"
+		}
 	}
 }
 
@@ -37,7 +41,6 @@ dependencies {
 
 	implementation 'com.github.ben-manes:gradle-versions-plugin:0.25.0'
 	implementation 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.21.1'
-	implementation 'io.spring.gradle:dependency-management-plugin:1.0.9.RELEASE'
 	implementation 'io.spring.gradle:docbook-reference-plugin:0.3.1'
 	implementation 'io.spring.gradle:propdeps-plugin:0.0.10.RELEASE'
 	implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.15'

buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy

@@ -56,7 +56,6 @@ public abstract class AbstractSpringJavaPlugin implements Plugin<Project> {
 		}
 		pluginManager.apply("io.spring.convention.tests-configuration");
 		pluginManager.apply("io.spring.convention.integration-test");
-		pluginManager.apply("io.spring.convention.springdependencymangement");
 		pluginManager.apply("io.spring.convention.dependency-set");
 		pluginManager.apply("io.spring.convention.javadoc-options");
 		pluginManager.apply("io.spring.convention.checkstyle");

buildSrc/src/main/groovy/io/spring/gradle/convention/DependencyManagementExportTask.groovy

@@ -57,8 +57,6 @@ class RootProjectPlugin implements Plugin<Project> {
 			}
 		}
 
-		project.tasks.create("dependencyManagementExport", DependencyManagementExportTask)
-
 		def finalizeDeployArtifacts = project.task("finalizeDeployArtifacts")
 		if (Utils.isRelease(project) && project.hasProperty("ossrhUsername")) {
 			project.ext.nexusUsername = project.ossrhUsername

buildSrc/src/main/groovy/io/spring/gradle/convention/RootProjectPlugin.groovy

@@ -1,9 +1,5 @@
 package io.spring.gradle.convention
 
-import io.spring.gradle.dependencymanagement.DependencyManagementPlugin
-import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension
-import io.spring.gradle.dependencymanagement.dsl.GeneratedPomCustomizationHandler
-import org.gradle.api.Action
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.XmlProvider
@@ -57,9 +53,7 @@ public class SpringMavenPlugin implements Plugin<Project> {
 			}
 		}
 
-		project.plugins.withType(DependencyManagementPlugin) {
-			inlineDependencyManagement(project);
-		}
+		inlineDependencyManagement(project);
 
 		def hasSigningKey = project.hasProperty("signing.keyId") || project.findProperty("signingKey")
 		if(hasSigningKey && Utils.isRelease(project)) {
@@ -70,9 +64,6 @@ public class SpringMavenPlugin implements Plugin<Project> {
 	}
 
 	private void inlineDependencyManagement(Project project) {
-		final DependencyManagementExtension dependencyManagement = project.getExtensions().findByType(DependencyManagementExtension.class);
-		dependencyManagement.generatedPomCustomization( { handler -> handler.setEnabled(false) });
-
 		project.install {
 			repositories.mavenInstaller {
 				configurePomForInlineDependencies(project, pom)
@@ -89,7 +80,7 @@ public class SpringMavenPlugin implements Plugin<Project> {
 		pom.withXml { XmlProvider xml ->
 			project.plugins.withType(JavaBasePlugin) {
 				def dependencies = xml.asNode()?.dependencies?.dependency
-				def configuredDependencies = project.configurations.findAll{ it.canBeResolved }*.incoming*.resolutionResult*.allDependencies.flatten()
+				def configuredDependencies = project.configurations.findAll{ it.canBeResolved && it.canBeConsumed }*.incoming*.resolutionResult*.allDependencies.flatten()
 				dependencies?.each { Node dep ->
 					def group = dep.groupId.text()
 					def name = dep.artifactId.text()

buildSrc/src/main/groovy/io/spring/gradle/convention/SpringDependencyManagementConventionPlugin.groovy

@@ -1,6 +1,7 @@
 apply plugin: 'io.spring.convention.spring-module'
 
 dependencies {
+	management platform('io.spring.platform:platform-bom:Brussels-RELEASE')
 	compile 'org.springframework:spring-web'
 	compile 'org.springframework:spring-core'
 	testCompile 'junit:junit'