Update Gradle configuration names

Closes spring-projectsgh-9540

acl/spring-security-acl.gradle

@@ -1,18 +1,18 @@
 apply plugin: 'io.spring.convention.spring-module'
 
 dependencies {
-	compile project(':spring-security-core')
-	compile 'org.springframework:spring-aop'
-	compile 'org.springframework:spring-context'
-	compile 'org.springframework:spring-core'
-	compile 'org.springframework:spring-jdbc'
-	compile 'org.springframework:spring-tx'
+	api project(':spring-security-core')
+	api 'org.springframework:spring-aop'
+	api 'org.springframework:spring-context'
+	api 'org.springframework:spring-core'
+	api 'org.springframework:spring-jdbc'
+	api 'org.springframework:spring-tx'
 
 	optional 'net.sf.ehcache:ehcache'
 
-	testCompile 'org.springframework:spring-beans'
-	testCompile 'org.springframework:spring-context-support'
-	testCompile 'org.springframework:spring-test'
+	testImplementation 'org.springframework:spring-beans'
+	testImplementation 'org.springframework:spring-context-support'
+	testImplementation 'org.springframework:spring-test'
 
-	testRuntime 'org.hsqldb:hsqldb'
+	testRuntimeOnly 'org.hsqldb:hsqldb'
 }

aspects/spring-security-aspects.gradle

@@ -2,13 +2,13 @@ apply plugin: 'io.spring.convention.spring-module'
 apply plugin: 'io.freefair.aspectj'
 
 dependencies {
-	compile "org.aspectj:aspectjrt"
-	compile project(':spring-security-core')
-	compile 'org.springframework:spring-beans'
-	compile 'org.springframework:spring-context'
-	compile 'org.springframework:spring-core'
+	api "org.aspectj:aspectjrt"
+	api project(':spring-security-core')
+	api 'org.springframework:spring-beans'
+	api 'org.springframework:spring-context'
+	api 'org.springframework:spring-core'
 
-	testCompile 'org.springframework:spring-aop'
+	testImplementation 'org.springframework:spring-aop'
 	testAspect sourceSets.main.output
 }
 

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

@@ -119,7 +119,7 @@ public class DependencySetPlugin implements Plugin<Project> {
 
 		project.plugins.withType(JavaPlugin) {
 			project.dependencies {
-				testCompile project.testDependencies
+				testImplementation project.testDependencies
 			}
 		}
 	}

cas/spring-security-cas.gradle

@@ -1,18 +1,18 @@
 apply plugin: 'io.spring.convention.spring-module'
 
 dependencies {
-	compile project(':spring-security-core')
-	compile project(':spring-security-web')
-	compile 'org.jasig.cas.client:cas-client-core'
-	compile 'org.springframework:spring-beans'
-	compile 'org.springframework:spring-context'
-	compile 'org.springframework:spring-core'
-	compile 'org.springframework:spring-web'
+	api project(':spring-security-core')
+	api project(':spring-security-web')
+	api 'org.jasig.cas.client:cas-client-core'
+	api 'org.springframework:spring-beans'
+	api 'org.springframework:spring-context'
+	api 'org.springframework:spring-core'
+	api 'org.springframework:spring-web'
 
 	optional 'com.fasterxml.jackson.core:jackson-databind'
 	optional 'net.sf.ehcache:ehcache'
 
 	provided 'javax.servlet:javax.servlet-api'
 
-	testCompile 'org.skyscreamer:jsonassert'
+	testImplementation 'org.skyscreamer:jsonassert'
 }

config/spring-security-config.gradle

@@ -10,11 +10,11 @@ repositories {
 
 dependencies {
 	// NB: Don't add other compile time dependencies to the config module as this breaks tooling
-	compile project(':spring-security-core')
-	compile 'org.springframework:spring-aop'
-	compile 'org.springframework:spring-beans'
-	compile 'org.springframework:spring-context'
-	compile 'org.springframework:spring-core'
+	api project(':spring-security-core')
+	api 'org.springframework:spring-aop'
+	api 'org.springframework:spring-beans'
+	api 'org.springframework:spring-context'
+	api 'org.springframework:spring-core'
 
 	optional project(':spring-security-ldap')
 	optional project(':spring-security-messaging')
@@ -40,52 +40,52 @@ dependencies {
 
 	provided 'javax.servlet:javax.servlet-api'
 
-	testCompile project(':spring-security-aspects')
-	testCompile project(':spring-security-cas')
-	testCompile project(':spring-security-test')
-	testCompile project(path : ':spring-security-core', configuration : 'tests')
-	testCompile project(path : ':spring-security-ldap', configuration : 'tests')
-	testCompile project(path : ':spring-security-oauth2-client', configuration : 'tests')
-	testCompile project(path : ':spring-security-oauth2-resource-server', configuration : 'tests')
-	testCompile project(path : ':saml2-service-provider-core', configuration : 'tests')
-	testCompile project(path : ':saml2-service-provider-opensaml4', configuration : 'tests')
-	testCompile project(path : ':spring-security-web', configuration : 'tests')
-	testCompile apachedsDependencies
-	testCompile powerMock2Dependencies
-	testCompile 'com.squareup.okhttp3:mockwebserver'
-	testCompile 'ch.qos.logback:logback-classic'
-	testCompile 'io.projectreactor.netty:reactor-netty'
-	testCompile 'io.rsocket:rsocket-transport-netty'
-	testCompile 'javax.annotation:jsr250-api:1.0'
-	testCompile 'javax.xml.bind:jaxb-api'
-	testCompile 'ldapsdk:ldapsdk:4.1'
-	testCompile('net.sourceforge.htmlunit:htmlunit') {
+	testImplementation project(':spring-security-aspects')
+	testImplementation project(':spring-security-cas')
+	testImplementation project(':spring-security-test')
+	testImplementation project(path : ':spring-security-core', configuration : 'tests')
+	testImplementation project(path : ':spring-security-ldap', configuration : 'tests')
+	testImplementation project(path : ':spring-security-oauth2-client', configuration : 'tests')
+	testImplementation project(path : ':spring-security-oauth2-resource-server', configuration : 'tests')
+	testImplementation project(path : ':saml2-service-provider-core', configuration : 'tests')
+	testImplementation project(path : ':saml2-service-provider-opensaml4', configuration : 'tests')
+	testImplementation project(path : ':spring-security-web', configuration : 'tests')
+	testImplementation apachedsDependencies
+	testImplementation powerMock2Dependencies
+	testImplementation 'com.squareup.okhttp3:mockwebserver'
+	testImplementation 'ch.qos.logback:logback-classic'
+	testImplementation 'io.projectreactor.netty:reactor-netty'
+	testImplementation 'io.rsocket:rsocket-transport-netty'
+	testImplementation 'javax.annotation:jsr250-api:1.0'
+	testImplementation 'javax.xml.bind:jaxb-api'
+	testImplementation 'ldapsdk:ldapsdk:4.1'
+	testImplementation('net.sourceforge.htmlunit:htmlunit') {
 		exclude group: 'commons-logging', module: 'commons-logging'
 	}
-	testCompile 'org.eclipse.persistence:javax.persistence'
-	testCompile 'org.hibernate:hibernate-entitymanager'
-	testCompile 'org.hsqldb:hsqldb'
-	testCompile ('org.openid4java:openid4java-nodeps') {
+	testImplementation 'org.eclipse.persistence:javax.persistence'
+	testImplementation 'org.hibernate:hibernate-entitymanager'
+	testImplementation 'org.hsqldb:hsqldb'
+	testImplementation ('org.openid4java:openid4java-nodeps') {
 		exclude group: 'com.google.code.guice', module: 'guice'
 	}
-	testCompile('org.seleniumhq.selenium:htmlunit-driver') {
+	testImplementation('org.seleniumhq.selenium:htmlunit-driver') {
 		exclude group: 'commons-logging', module: 'commons-logging'
 	}
-	testCompile('org.seleniumhq.selenium:selenium-java') {
+	testImplementation('org.seleniumhq.selenium:selenium-java') {
 		exclude group: 'commons-logging', module: 'commons-logging'
 		exclude group: 'io.netty', module: 'netty'
 	}
-	testCompile 'org.slf4j:jcl-over-slf4j'
-	testCompile 'org.springframework.ldap:spring-ldap-core'
-	testCompile 'org.springframework:spring-expression'
-	testCompile 'org.springframework:spring-jdbc'
-	testCompile 'org.springframework:spring-orm'
-	testCompile 'org.springframework:spring-tx'
-	testCompile ('org.springframework.data:spring-data-jpa') {
+	testImplementation 'org.slf4j:jcl-over-slf4j'
+	testImplementation 'org.springframework.ldap:spring-ldap-core'
+	testImplementation 'org.springframework:spring-expression'
+	testImplementation 'org.springframework:spring-jdbc'
+	testImplementation 'org.springframework:spring-orm'
+	testImplementation 'org.springframework:spring-tx'
+	testImplementation ('org.springframework.data:spring-data-jpa') {
 		exclude group: 'org.aspectj', module: 'aspectjrt'
 	}
 
-	testRuntime 'org.hsqldb:hsqldb'
+	testRuntimeOnly 'org.hsqldb:hsqldb'
 }
 
 

core/spring-security-core.gradle

@@ -6,15 +6,15 @@ def includeProject = project(':spring-security-crypto')
 
 configurations {
 	included
-	compile.extendsFrom included
+	api.extendsFrom included
 }
 
 dependencies {
-	compile 'org.springframework:spring-aop'
-	compile 'org.springframework:spring-beans'
-	compile 'org.springframework:spring-context'
-	compile 'org.springframework:spring-core'
-	compile 'org.springframework:spring-expression'
+	api 'org.springframework:spring-aop'
+	api 'org.springframework:spring-beans'
+	api 'org.springframework:spring-context'
+	api 'org.springframework:spring-core'
+	api 'org.springframework:spring-expression'
 
 	included includeProject
 
@@ -26,14 +26,14 @@ dependencies {
 	optional 'org.springframework:spring-jdbc'
 	optional 'org.springframework:spring-tx'
 
-	testCompile powerMock2Dependencies
-	testCompile 'commons-collections:commons-collections'
-	testCompile 'io.projectreactor:reactor-test'
-	testCompile 'org.skyscreamer:jsonassert'
-	testCompile 'org.slf4j:jcl-over-slf4j'
-	testCompile 'org.springframework:spring-test'
+	testImplementation powerMock2Dependencies
+	testImplementation 'commons-collections:commons-collections'
+	testImplementation 'io.projectreactor:reactor-test'
+	testImplementation 'org.skyscreamer:jsonassert'
+	testImplementation 'org.slf4j:jcl-over-slf4j'
+	testImplementation 'org.springframework:spring-test'
 
-	testRuntime 'org.hsqldb:hsqldb'
+	testRuntimeOnly 'org.hsqldb:hsqldb'
 }
 
 task springVersion(type: org.gradle.api.tasks.WriteProperties) {

data/spring-security-data.gradle

@@ -1,9 +1,9 @@
 apply plugin: 'io.spring.convention.spring-module'
 
 dependencies {
-	compile project(':spring-security-core')
-	compile 'javax.xml.bind:jaxb-api'
-	compile 'org.springframework.data:spring-data-commons'
-	compile 'org.springframework:spring-core'
+	api project(':spring-security-core')
+	api 'javax.xml.bind:jaxb-api'
+	api 'org.springframework.data:spring-data-commons'
+	api 'org.springframework:spring-core'
 
 }

docs/manual/spring-security-docs-manual.gradle

@@ -21,7 +21,7 @@ asciidoctorj {
 		revnumber : project.version,
 		'gh-url': ghUrl,
 		'gh-samples-url': "$ghUrl/samples"
-	attributeProvider resolvedVersions(project.configurations.testCompile)
+	attributeProvider resolvedVersions(project.configurations.testRuntimeClasspath)
 }
 
 docsZip {
@@ -31,9 +31,9 @@ docsZip {
 }
 
 dependencies {
-	testCompile "com.unboundid:unboundid-ldapsdk"
-	testCompile "org.apache.directory.server:apacheds-core"
-	testCompile "org.springframework:spring-core"
+	testImplementation "com.unboundid:unboundid-ldapsdk"
+	testImplementation "org.apache.directory.server:apacheds-core"
+	testImplementation "org.springframework:spring-core"
 }
 
 def resolvedVersions(Configuration configuration) {

itest/context/spring-security-itest-context.gradle

@@ -1,19 +1,19 @@
 apply plugin: 'io.spring.convention.spring-test'
 
 dependencies {
-	compile project(':spring-security-core')
-	compile 'org.python:jython'
-	compile 'org.springframework:spring-aop'
-	compile 'org.springframework:spring-beans'
-	compile 'org.springframework:spring-context'
-	compile 'org.springframework:spring-tx'
+	implementation project(':spring-security-core')
+	implementation 'org.python:jython'
+	implementation 'org.springframework:spring-aop'
+	implementation 'org.springframework:spring-beans'
+	implementation 'org.springframework:spring-context'
+	implementation 'org.springframework:spring-tx'
 
-	testCompile project(':spring-security-web')
-	testCompile 'javax.servlet:javax.servlet-api'
-	testCompile 'org.springframework:spring-web'
+	testImplementation project(':spring-security-web')
+	testImplementation 'javax.servlet:javax.servlet-api'
+	testImplementation 'org.springframework:spring-web'
 
-	testRuntime project(':spring-security-config')
-	testRuntime 'org.aspectj:aspectjweaver'
+	testRuntimeOnly project(':spring-security-config')
+	testRuntimeOnly 'org.aspectj:aspectjweaver'
 }
 
 System.setProperty('python.cachedir.skip', 'true')

itest/ldap/embedded-ldap-apacheds-default/spring-security-itest-ldap-embedded-apacheds-default.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'io.spring.convention.spring-test'
 
 dependencies {
-    compile project(':spring-security-core')
-    compile 'org.springframework:spring-beans'
-    compile 'org.springframework:spring-context'
-    compile 'org.springframework:spring-core'
-    compile 'org.springframework:spring-tx'
-    compile project(':spring-security-config')
-    compile project(':spring-security-ldap')
+    implementation project(':spring-security-core')
+    implementation 'org.springframework:spring-beans'
+    implementation 'org.springframework:spring-context'
+    implementation 'org.springframework:spring-core'
+    implementation 'org.springframework:spring-tx'
+    implementation project(':spring-security-config')
+    implementation project(':spring-security-ldap')
 
-    runtime apachedsDependencies
+    runtimeOnly apachedsDependencies
 
-	testCompile project(path : ':spring-security-ldap', configuration : 'tests')
+	testImplementation project(path : ':spring-security-ldap', configuration : 'tests')
 }

itest/ldap/embedded-ldap-mode-apacheds/spring-security-itest-ldap-embedded-mode-apacheds.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'io.spring.convention.spring-test'
 
 dependencies {
-    compile project(':spring-security-core')
-    compile 'org.springframework:spring-beans'
-    compile 'org.springframework:spring-context'
-    compile 'org.springframework:spring-core'
-    compile 'org.springframework:spring-tx'
-    compile project(':spring-security-config')
-    compile project(':spring-security-ldap')
+    implementation project(':spring-security-core')
+    implementation 'org.springframework:spring-beans'
+    implementation 'org.springframework:spring-context'
+    implementation 'org.springframework:spring-core'
+    implementation 'org.springframework:spring-tx'
+    implementation project(':spring-security-config')
+    implementation project(':spring-security-ldap')
 
-    runtime apachedsDependencies
+    runtimeOnly apachedsDependencies
 
-	testCompile project(path : ':spring-security-ldap', configuration : 'tests')
+	testImplementation project(path : ':spring-security-ldap', configuration : 'tests')
 }

itest/ldap/embedded-ldap-mode-unboundid/spring-security-itest-ldap-embedded-mode-unboundid.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'io.spring.convention.spring-test'
 
 dependencies {
-    compile project(':spring-security-core')
-    compile 'org.springframework:spring-beans'
-    compile 'org.springframework:spring-context'
-    compile 'org.springframework:spring-core'
-    compile 'org.springframework:spring-tx'
-    compile project(':spring-security-config')
-    compile project(':spring-security-ldap')
+    implementation project(':spring-security-core')
+    implementation 'org.springframework:spring-beans'
+    implementation 'org.springframework:spring-context'
+    implementation 'org.springframework:spring-core'
+    implementation 'org.springframework:spring-tx'
+    implementation project(':spring-security-config')
+    implementation project(':spring-security-ldap')
 
-    testCompile "com.unboundid:unboundid-ldapsdk"
+    testImplementation "com.unboundid:unboundid-ldapsdk"
 }

itest/ldap/embedded-ldap-none/spring-security-itest-ldap-embedded-none.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'io.spring.convention.spring-test'
 
 dependencies {
-    compile project(':spring-security-core')
-    compile 'org.springframework:spring-beans'
-    compile 'org.springframework:spring-context'
-    compile 'org.springframework:spring-core'
-    compile 'org.springframework:spring-tx'
-    compile project(':spring-security-config')
-    compile project(':spring-security-ldap')
+    implementation project(':spring-security-core')
+    implementation 'org.springframework:spring-beans'
+    implementation 'org.springframework:spring-context'
+    implementation 'org.springframework:spring-core'
+    implementation 'org.springframework:spring-tx'
+    implementation project(':spring-security-config')
+    implementation project(':spring-security-ldap')
 }