Remove DependencySetPlugin

Closes gh-10070

Author: rwinch

acl/spring-security-acl.gradle

@@ -11,9 +11,15 @@ dependencies {
 
 	optional 'net.sf.ehcache:ehcache'
 
+	testImplementation "org.assertj:assertj-core"
+	testImplementation "org.junit.jupiter:junit-jupiter-api"
+	testImplementation "org.junit.jupiter:junit-jupiter-params"
+	testImplementation "org.junit.jupiter:junit-jupiter-engine"
+	testImplementation "org.mockito:mockito-core"
+	testImplementation "org.mockito:mockito-junit-jupiter"
 	testImplementation 'org.springframework:spring-beans'
 	testImplementation 'org.springframework:spring-context-support'
-	testImplementation 'org.springframework:spring-test'
+	testImplementation "org.springframework:spring-test"
 
 	testRuntimeOnly 'org.hsqldb:hsqldb'
 }

aspects/spring-security-aspects.gradle

@@ -10,6 +10,13 @@ dependencies {
 	api 'org.springframework:spring-core'
 
 	testImplementation 'org.springframework:spring-aop'
+	testImplementation "org.assertj:assertj-core"
+	testImplementation "org.junit.jupiter:junit-jupiter-api"
+	testImplementation "org.junit.jupiter:junit-jupiter-params"
+	testImplementation "org.junit.jupiter:junit-jupiter-engine"
+	testImplementation "org.mockito:mockito-core"
+	testImplementation "org.mockito:mockito-junit-jupiter"
+	testImplementation "org.springframework:spring-test"
 	testAspect sourceSets.main.output
 }
 

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

@@ -57,7 +57,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.dependency-set");
 		pluginManager.apply("io.spring.convention.javadoc-options");
 		pluginManager.apply("io.spring.convention.checkstyle");
 		pluginManager.apply(CopyPropertiesPlugin);

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

@@ -1,7 +1,6 @@
 package io.spring.gradle.convention;
 
 import io.spring.gradle.TestKit;
-import org.codehaus.groovy.runtime.ResourceGroovyMethods;
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.TaskOutcome;
 import org.junit.jupiter.api.BeforeEach;