From 1a76ee74426480fbf5237fb8ff3c2ab35dab137a Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Sun, 4 Apr 2021 07:31:47 -0500 Subject: [PATCH] Update Gradle configuration names Closes gh-9540 --- acl/spring-security-acl.gradle | 20 ++--- aspects/spring-security-aspects.gradle | 12 +-- .../convention/DependencySetPlugin.groovy | 2 +- cas/spring-security-cas.gradle | 16 ++-- config/spring-security-config.gradle | 78 +++++++++---------- core/spring-security-core.gradle | 26 +++---- data/spring-security-data.gradle | 8 +- .../manual/spring-security-docs-manual.gradle | 8 +- .../spring-security-itest-context.gradle | 22 +++--- ...test-ldap-embedded-apacheds-default.gradle | 18 ++--- ...y-itest-ldap-embedded-mode-apacheds.gradle | 18 ++--- ...-itest-ldap-embedded-mode-unboundid.gradle | 16 ++-- ...g-security-itest-ldap-embedded-none.gradle | 14 ++-- ...est-ldap-embedded-unboundid-default.gradle | 16 ++-- itest/web/spring-security-itest-web.gradle | 20 ++--- ldap/spring-security-ldap.gradle | 18 ++--- messaging/spring-security-messaging.gradle | 22 +++--- .../spring-security-oauth2-client.gradle | 32 ++++---- .../spring-security-oauth2-core.gradle | 8 +- .../spring-security-oauth2-jose.gradle | 16 ++-- ...ing-security-oauth2-resource-server.gradle | 18 ++--- openid/spring-security-openid.gradle | 22 +++--- remoting/spring-security-remoting.gradle | 14 ++-- rsocket/spring-security-rsocket.gradle | 6 +- .../core/saml2-service-provider-core.gradle | 6 +- .../saml2-service-provider-opensaml3.gradle | 12 +-- .../saml2-service-provider-opensaml4.gradle | 12 +-- taglibs/spring-security-taglibs.gradle | 20 ++--- test/spring-security-test.gradle | 26 +++---- web/spring-security-web.gradle | 32 ++++---- 30 files changed, 279 insertions(+), 279 deletions(-) diff --git a/acl/spring-security-acl.gradle b/acl/spring-security-acl.gradle index 53b4864c38..d4bb36b16b 100644 --- a/acl/spring-security-acl.gradle +++ b/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' } diff --git a/aspects/spring-security-aspects.gradle b/aspects/spring-security-aspects.gradle index 6b50ef7235..7512b1e097 100644 --- a/aspects/spring-security-aspects.gradle +++ b/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 } diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/DependencySetPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/DependencySetPlugin.groovy index 02b0037e28..b4670771e0 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/DependencySetPlugin.groovy +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/DependencySetPlugin.groovy @@ -119,7 +119,7 @@ public class DependencySetPlugin implements Plugin { project.plugins.withType(JavaPlugin) { project.dependencies { - testCompile project.testDependencies + testImplementation project.testDependencies } } } diff --git a/cas/spring-security-cas.gradle b/cas/spring-security-cas.gradle index b135885690..58539f0402 100644 --- a/cas/spring-security-cas.gradle +++ b/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' } diff --git a/config/spring-security-config.gradle b/config/spring-security-config.gradle index 03cfeddff8..1f07cc73c8 100644 --- a/config/spring-security-config.gradle +++ b/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' } diff --git a/core/spring-security-core.gradle b/core/spring-security-core.gradle index 7eb5f611cc..541e699d6e 100644 --- a/core/spring-security-core.gradle +++ b/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) { diff --git a/data/spring-security-data.gradle b/data/spring-security-data.gradle index 8830889f2e..14c1a69a16 100644 --- a/data/spring-security-data.gradle +++ b/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' } diff --git a/docs/manual/spring-security-docs-manual.gradle b/docs/manual/spring-security-docs-manual.gradle index 28d315628d..f8b83fd874 100644 --- a/docs/manual/spring-security-docs-manual.gradle +++ b/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) { diff --git a/itest/context/spring-security-itest-context.gradle b/itest/context/spring-security-itest-context.gradle index 855cea3953..409fa0c4fe 100644 --- a/itest/context/spring-security-itest-context.gradle +++ b/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') diff --git a/itest/ldap/embedded-ldap-apacheds-default/spring-security-itest-ldap-embedded-apacheds-default.gradle b/itest/ldap/embedded-ldap-apacheds-default/spring-security-itest-ldap-embedded-apacheds-default.gradle index 80a2bec358..d07e919766 100644 --- a/itest/ldap/embedded-ldap-apacheds-default/spring-security-itest-ldap-embedded-apacheds-default.gradle +++ b/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') } diff --git a/itest/ldap/embedded-ldap-mode-apacheds/spring-security-itest-ldap-embedded-mode-apacheds.gradle b/itest/ldap/embedded-ldap-mode-apacheds/spring-security-itest-ldap-embedded-mode-apacheds.gradle index 80a2bec358..d07e919766 100644 --- a/itest/ldap/embedded-ldap-mode-apacheds/spring-security-itest-ldap-embedded-mode-apacheds.gradle +++ b/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') } diff --git a/itest/ldap/embedded-ldap-mode-unboundid/spring-security-itest-ldap-embedded-mode-unboundid.gradle b/itest/ldap/embedded-ldap-mode-unboundid/spring-security-itest-ldap-embedded-mode-unboundid.gradle index 45f180468b..ecc9a0782e 100644 --- a/itest/ldap/embedded-ldap-mode-unboundid/spring-security-itest-ldap-embedded-mode-unboundid.gradle +++ b/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" } diff --git a/itest/ldap/embedded-ldap-none/spring-security-itest-ldap-embedded-none.gradle b/itest/ldap/embedded-ldap-none/spring-security-itest-ldap-embedded-none.gradle index 79d8418fde..1f178590ab 100644 --- a/itest/ldap/embedded-ldap-none/spring-security-itest-ldap-embedded-none.gradle +++ b/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') } diff --git a/itest/ldap/embedded-ldap-unboundid-default/spring-security-itest-ldap-embedded-unboundid-default.gradle b/itest/ldap/embedded-ldap-unboundid-default/spring-security-itest-ldap-embedded-unboundid-default.gradle index 45f180468b..ecc9a0782e 100644 --- a/itest/ldap/embedded-ldap-unboundid-default/spring-security-itest-ldap-embedded-unboundid-default.gradle +++ b/itest/ldap/embedded-ldap-unboundid-default/spring-security-itest-ldap-embedded-unboundid-default.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" } diff --git a/itest/web/spring-security-itest-web.gradle b/itest/web/spring-security-itest-web.gradle index bbe818a3db..54dd7b30f5 100644 --- a/itest/web/spring-security-itest-web.gradle +++ b/itest/web/spring-security-itest-web.gradle @@ -1,20 +1,20 @@ apply plugin: 'io.spring.convention.spring-test' dependencies { - compile 'org.springframework:spring-context' - compile 'org.springframework:spring-web' + implementation 'org.springframework:spring-context' + implementation 'org.springframework:spring-web' provided 'javax.servlet:javax.servlet-api' - testCompile project(':spring-security-core') - testCompile project(':spring-security-test') - testCompile project(':spring-security-web') - testCompile 'org.springframework:spring-beans' - testCompile 'org.springframework:spring-test' - testCompile 'org.springframework:spring-webmvc' + testImplementation project(':spring-security-core') + testImplementation project(':spring-security-test') + testImplementation project(':spring-security-web') + testImplementation 'org.springframework:spring-beans' + testImplementation 'org.springframework:spring-test' + testImplementation 'org.springframework:spring-webmvc' - testRuntime project(':spring-security-config') - testRuntime project(':spring-security-ldap') + testRuntimeOnly project(':spring-security-config') + testRuntimeOnly project(':spring-security-ldap') } integrationTest { diff --git a/ldap/spring-security-ldap.gradle b/ldap/spring-security-ldap.gradle index 64f8c0003d..dafcda7ddd 100644 --- a/ldap/spring-security-ldap.gradle +++ b/ldap/spring-security-ldap.gradle @@ -1,18 +1,18 @@ apply plugin: 'io.spring.convention.spring-module' 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' + api project(':spring-security-core') + api 'org.springframework:spring-beans' + api 'org.springframework:spring-context' + api 'org.springframework:spring-core' + api 'org.springframework:spring-tx' optional apachedsDependencies optional 'ldapsdk:ldapsdk' optional "com.unboundid:unboundid-ldapsdk" optional 'org.apache.directory.shared:shared-ldap' - compile ('org.springframework.ldap:spring-ldap-core') { + api ('org.springframework.ldap:spring-ldap-core') { exclude(group: 'commons-logging', module: 'commons-logging') exclude(group: 'org.springframework', module: 'spring-beans') exclude(group: 'org.springframework', module: 'spring-core') @@ -20,9 +20,9 @@ dependencies { exclude(group: 'org.springframework.data', module: 'spring-data-commons') } - testCompile project(':spring-security-test') - testCompile 'org.slf4j:jcl-over-slf4j' - testCompile 'org.slf4j:slf4j-api' + testImplementation project(':spring-security-test') + testImplementation 'org.slf4j:jcl-over-slf4j' + testImplementation 'org.slf4j:slf4j-api' } integrationTest { diff --git a/messaging/spring-security-messaging.gradle b/messaging/spring-security-messaging.gradle index 05d8d34f0a..df6d8fea16 100644 --- a/messaging/spring-security-messaging.gradle +++ b/messaging/spring-security-messaging.gradle @@ -1,22 +1,22 @@ apply plugin: 'io.spring.convention.spring-module' 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-expression' - compile 'org.springframework:spring-messaging' + api project(':spring-security-core') + api 'org.springframework:spring-beans' + api 'org.springframework:spring-context' + api 'org.springframework:spring-core' + api 'org.springframework:spring-expression' + api 'org.springframework:spring-messaging' optional project(':spring-security-web') optional 'org.springframework:spring-websocket' optional 'io.projectreactor:reactor-core' optional 'javax.servlet:javax.servlet-api' - testCompile project(path: ':spring-security-core', configuration: 'tests') - testCompile 'commons-codec:commons-codec' - testCompile powerMock2Dependencies - testCompile slf4jDependencies + testImplementation project(path: ':spring-security-core', configuration: 'tests') + testImplementation 'commons-codec:commons-codec' + testImplementation powerMock2Dependencies + testImplementation slf4jDependencies - testRuntime 'org.hsqldb:hsqldb' + testRuntimeOnly 'org.hsqldb:hsqldb' } diff --git a/oauth2/oauth2-client/spring-security-oauth2-client.gradle b/oauth2/oauth2-client/spring-security-oauth2-client.gradle index a966c27b8c..2036737056 100644 --- a/oauth2/oauth2-client/spring-security-oauth2-client.gradle +++ b/oauth2/oauth2-client/spring-security-oauth2-client.gradle @@ -1,11 +1,11 @@ apply plugin: 'io.spring.convention.spring-module' dependencies { - compile project(':spring-security-core') - compile project(':spring-security-oauth2-core') - compile project(':spring-security-web') - compile springCoreDependency - compile 'com.nimbusds:oauth2-oidc-sdk' + api project(':spring-security-core') + api project(':spring-security-oauth2-core') + api project(':spring-security-web') + api springCoreDependency + api 'com.nimbusds:oauth2-oidc-sdk' optional project(':spring-security-oauth2-jose') optional 'io.projectreactor:reactor-core' @@ -15,18 +15,18 @@ dependencies { optional 'org.springframework:spring-jdbc' optional 'org.springframework:spring-r2dbc' - testCompile project(path: ':spring-security-oauth2-core', configuration: 'tests') - testCompile project(path: ':spring-security-oauth2-jose', configuration: 'tests') - testCompile powerMock2Dependencies - testCompile 'com.squareup.okhttp3:mockwebserver' - testCompile 'io.projectreactor.netty:reactor-netty' - testCompile 'io.projectreactor:reactor-test' - testCompile 'io.projectreactor.tools:blockhound' - testCompile 'org.skyscreamer:jsonassert' - testCompile 'io.r2dbc:r2dbc-h2:0.8.4.RELEASE' - testCompile 'io.r2dbc:r2dbc-spi-test:0.8.3.RELEASE' + testImplementation project(path: ':spring-security-oauth2-core', configuration: 'tests') + testImplementation project(path: ':spring-security-oauth2-jose', configuration: 'tests') + testImplementation powerMock2Dependencies + testImplementation 'com.squareup.okhttp3:mockwebserver' + testImplementation 'io.projectreactor.netty:reactor-netty' + testImplementation 'io.projectreactor:reactor-test' + testImplementation 'io.projectreactor.tools:blockhound' + testImplementation 'org.skyscreamer:jsonassert' + testImplementation 'io.r2dbc:r2dbc-h2:0.8.4.RELEASE' + testImplementation 'io.r2dbc:r2dbc-spi-test:0.8.3.RELEASE' - testRuntime 'org.hsqldb:hsqldb' + testRuntimeOnly 'org.hsqldb:hsqldb' provided 'javax.servlet:javax.servlet-api' } diff --git a/oauth2/oauth2-core/spring-security-oauth2-core.gradle b/oauth2/oauth2-core/spring-security-oauth2-core.gradle index 0ee8e931c8..86342f56fe 100644 --- a/oauth2/oauth2-core/spring-security-oauth2-core.gradle +++ b/oauth2/oauth2-core/spring-security-oauth2-core.gradle @@ -1,13 +1,13 @@ apply plugin: 'io.spring.convention.spring-module' dependencies { - compile project(':spring-security-core') - compile springCoreDependency - compile 'org.springframework:spring-web' + api project(':spring-security-core') + api springCoreDependency + api 'org.springframework:spring-web' optional 'com.fasterxml.jackson.core:jackson-databind' optional 'com.nimbusds:oauth2-oidc-sdk' optional 'org.springframework:spring-webflux' - testCompile powerMock2Dependencies + testImplementation powerMock2Dependencies } diff --git a/oauth2/oauth2-jose/spring-security-oauth2-jose.gradle b/oauth2/oauth2-jose/spring-security-oauth2-jose.gradle index ff521ca88e..1b3fc659d8 100644 --- a/oauth2/oauth2-jose/spring-security-oauth2-jose.gradle +++ b/oauth2/oauth2-jose/spring-security-oauth2-jose.gradle @@ -1,16 +1,16 @@ apply plugin: 'io.spring.convention.spring-module' dependencies { - compile project(':spring-security-core') - compile project(':spring-security-oauth2-core') - compile springCoreDependency - compile 'com.nimbusds:nimbus-jose-jwt' + api project(':spring-security-core') + api project(':spring-security-oauth2-core') + api springCoreDependency + api 'com.nimbusds:nimbus-jose-jwt' optional 'io.projectreactor:reactor-core' optional 'org.springframework:spring-webflux' - testCompile powerMock2Dependencies - testCompile 'com.squareup.okhttp3:mockwebserver' - testCompile 'io.projectreactor.netty:reactor-netty' - testCompile 'com.fasterxml.jackson.core:jackson-databind' + testImplementation powerMock2Dependencies + testImplementation 'com.squareup.okhttp3:mockwebserver' + testImplementation 'io.projectreactor.netty:reactor-netty' + testImplementation 'com.fasterxml.jackson.core:jackson-databind' } diff --git a/oauth2/oauth2-resource-server/spring-security-oauth2-resource-server.gradle b/oauth2/oauth2-resource-server/spring-security-oauth2-resource-server.gradle index 3cfcaebefc..2e3a2b4c87 100644 --- a/oauth2/oauth2-resource-server/spring-security-oauth2-resource-server.gradle +++ b/oauth2/oauth2-resource-server/spring-security-oauth2-resource-server.gradle @@ -1,10 +1,10 @@ apply plugin: 'io.spring.convention.spring-module' dependencies { - compile project(':spring-security-core') - compile project(':spring-security-oauth2-core') - compile project(':spring-security-web') - compile springCoreDependency + api project(':spring-security-core') + api project(':spring-security-oauth2-core') + api project(':spring-security-web') + api springCoreDependency optional project(':spring-security-oauth2-jose') optional 'com.nimbusds:oauth2-oidc-sdk' @@ -13,9 +13,9 @@ dependencies { provided 'javax.servlet:javax.servlet-api' - testCompile project(path: ':spring-security-oauth2-jose', configuration: 'tests') - testCompile 'com.squareup.okhttp3:mockwebserver' - testCompile 'com.fasterxml.jackson.core:jackson-databind' - testCompile 'io.projectreactor.netty:reactor-netty' - testCompile 'io.projectreactor:reactor-test' + testImplementation project(path: ':spring-security-oauth2-jose', configuration: 'tests') + testImplementation 'com.squareup.okhttp3:mockwebserver' + testImplementation 'com.fasterxml.jackson.core:jackson-databind' + testImplementation 'io.projectreactor.netty:reactor-netty' + testImplementation 'io.projectreactor:reactor-test' } diff --git a/openid/spring-security-openid.gradle b/openid/spring-security-openid.gradle index 8e3820d151..2442afead6 100644 --- a/openid/spring-security-openid.gradle +++ b/openid/spring-security-openid.gradle @@ -5,25 +5,25 @@ apply plugin: 'io.spring.convention.spring-module' dependencies { - compile project(':spring-security-core') - compile project(':spring-security-web') - compile('com.google.inject:guice') { + api project(':spring-security-core') + api project(':spring-security-web') + api('com.google.inject:guice') { exclude group: 'aopalliance', module: 'aopalliance' } // openid4java has a compile time dep on guice with a group // name which is different from the maven central one. // We use the maven central version here instead. - compile('org.openid4java:openid4java-nodeps') { + api('org.openid4java:openid4java-nodeps') { exclude group: 'com.google.code.guice', module: 'guice' } - compile 'org.springframework:spring-aop' - compile 'org.springframework:spring-beans' - compile 'org.springframework:spring-context' - compile 'org.springframework:spring-core' - compile 'org.springframework:spring-web' + api 'org.springframework:spring-aop' + api 'org.springframework:spring-beans' + api 'org.springframework:spring-context' + api 'org.springframework:spring-core' + api 'org.springframework:spring-web' provided 'javax.servlet:javax.servlet-api' - runtime 'net.sourceforge.nekohtml:nekohtml' - runtime 'org.apache.httpcomponents:httpclient' + runtimeOnly 'net.sourceforge.nekohtml:nekohtml' + runtimeOnly 'org.apache.httpcomponents:httpclient' } diff --git a/remoting/spring-security-remoting.gradle b/remoting/spring-security-remoting.gradle index f3d8a34249..7ed258ecc4 100644 --- a/remoting/spring-security-remoting.gradle +++ b/remoting/spring-security-remoting.gradle @@ -1,12 +1,12 @@ apply plugin: 'io.spring.convention.spring-module' dependencies { - 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' - compile 'org.springframework:spring-web' + 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' + api 'org.springframework:spring-web' - testCompile project(path: ':spring-security-core', configuration: 'tests') + testImplementation project(path: ':spring-security-core', configuration: 'tests') } diff --git a/rsocket/spring-security-rsocket.gradle b/rsocket/spring-security-rsocket.gradle index fa508c2760..72339b470c 100644 --- a/rsocket/spring-security-rsocket.gradle +++ b/rsocket/spring-security-rsocket.gradle @@ -1,9 +1,9 @@ apply plugin: 'io.spring.convention.spring-module' dependencies { - compile project(':spring-security-core') - compile 'io.rsocket:rsocket-core' + api project(':spring-security-core') + api 'io.rsocket:rsocket-core' optional project(':spring-security-oauth2-resource-server') optional 'org.springframework:spring-messaging' - testCompile 'io.projectreactor:reactor-test' + testImplementation 'io.projectreactor:reactor-test' } diff --git a/saml2/saml2-service-provider/core/saml2-service-provider-core.gradle b/saml2/saml2-service-provider/core/saml2-service-provider-core.gradle index 6a64caa2fc..2deaee16c7 100644 --- a/saml2/saml2-service-provider/core/saml2-service-provider-core.gradle +++ b/saml2/saml2-service-provider/core/saml2-service-provider-core.gradle @@ -40,8 +40,8 @@ dependencies { management("org.opensaml:opensaml-saml-impl:3.+") } - compile project(':spring-security-core') - compile project(':spring-security-web') + api project(':spring-security-core') + api project(':spring-security-web') provided("org.opensaml:opensaml-core") provided("org.opensaml:opensaml-saml-api") @@ -49,5 +49,5 @@ dependencies { provided 'javax.servlet:javax.servlet-api' - testCompile 'com.squareup.okhttp3:mockwebserver' + testImplementation 'com.squareup.okhttp3:mockwebserver' } diff --git a/saml2/saml2-service-provider/opensaml3/saml2-service-provider-opensaml3.gradle b/saml2/saml2-service-provider/opensaml3/saml2-service-provider-opensaml3.gradle index 02b7e0e849..71c2af9eac 100644 --- a/saml2/saml2-service-provider/opensaml3/saml2-service-provider-opensaml3.gradle +++ b/saml2/saml2-service-provider/opensaml3/saml2-service-provider-opensaml3.gradle @@ -40,14 +40,14 @@ dependencies { management("org.opensaml:opensaml-saml-impl:3.+") } - compile project(':saml2-service-provider-core') + api project(':saml2-service-provider-core') - compile("org.opensaml:opensaml-core") - compile("org.opensaml:opensaml-saml-api") - compile("org.opensaml:opensaml-saml-impl") + api("org.opensaml:opensaml-core") + api("org.opensaml:opensaml-saml-api") + api("org.opensaml:opensaml-saml-impl") provided 'javax.servlet:javax.servlet-api' - testCompile 'com.squareup.okhttp3:mockwebserver' - testCompile project(path : ':saml2-service-provider-core', configuration : 'tests') + testImplementation 'com.squareup.okhttp3:mockwebserver' + testImplementation project(path : ':saml2-service-provider-core', configuration : 'tests') } diff --git a/saml2/saml2-service-provider/opensaml4/saml2-service-provider-opensaml4.gradle b/saml2/saml2-service-provider/opensaml4/saml2-service-provider-opensaml4.gradle index 2b5deabaf5..906b5cc824 100644 --- a/saml2/saml2-service-provider/opensaml4/saml2-service-provider-opensaml4.gradle +++ b/saml2/saml2-service-provider/opensaml4/saml2-service-provider-opensaml4.gradle @@ -45,14 +45,14 @@ dependencies { management("org.opensaml:opensaml-saml-impl:4.+") } - compile project(':saml2-service-provider-core') + api project(':saml2-service-provider-core') - compile("org.opensaml:opensaml-core") - compile("org.opensaml:opensaml-saml-api") - compile("org.opensaml:opensaml-saml-impl") + api("org.opensaml:opensaml-core") + api("org.opensaml:opensaml-saml-api") + api("org.opensaml:opensaml-saml-impl") provided 'javax.servlet:javax.servlet-api' - testCompile 'com.squareup.okhttp3:mockwebserver' - testCompile project(path : ':saml2-service-provider-core', configuration : 'tests') + testImplementation 'com.squareup.okhttp3:mockwebserver' + testImplementation project(path : ':saml2-service-provider-core', configuration : 'tests') } diff --git a/taglibs/spring-security-taglibs.gradle b/taglibs/spring-security-taglibs.gradle index 2a6896fb6f..6711a2e94e 100644 --- a/taglibs/spring-security-taglibs.gradle +++ b/taglibs/spring-security-taglibs.gradle @@ -1,20 +1,20 @@ apply plugin: 'io.spring.convention.spring-module' dependencies { - compile project(':spring-security-acl') - compile project(':spring-security-core') - compile project(':spring-security-web') - 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' - compile 'org.springframework:spring-web' + api project(':spring-security-acl') + api project(':spring-security-core') + api project(':spring-security-web') + 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' + api 'org.springframework:spring-web' provided 'javax.servlet.jsp:javax.servlet.jsp-api' provided 'javax.servlet:javax.servlet-api' - testRuntime 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api' + testRuntimeOnly 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api' } configure(project.tasks.withType(Test)) { diff --git a/test/spring-security-test.gradle b/test/spring-security-test.gradle index 6d41565ad4..3051a2888d 100644 --- a/test/spring-security-test.gradle +++ b/test/spring-security-test.gradle @@ -1,10 +1,10 @@ apply plugin: 'io.spring.convention.spring-module' dependencies { - compile project(':spring-security-core') - compile project(':spring-security-web') - compile 'org.springframework:spring-core' - compile 'org.springframework:spring-test' + api project(':spring-security-core') + api project(':spring-security-web') + api 'org.springframework:spring-core' + api 'org.springframework:spring-test' optional project(':spring-security-config') optional project(':spring-security-oauth2-client') @@ -16,13 +16,13 @@ dependencies { provided 'javax.servlet:javax.servlet-api' - testCompile project(path : ':spring-security-config', configuration : 'tests') - testCompile 'com.fasterxml.jackson.core:jackson-databind' - testCompile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310' - testCompile 'io.projectreactor:reactor-test' - testCompile 'javax.xml.bind:jaxb-api' - testCompile 'org.skyscreamer:jsonassert' - testCompile 'org.springframework:spring-webmvc' - testCompile 'org.springframework:spring-tx' - testCompile powerMock2Dependencies + testImplementation project(path : ':spring-security-config', configuration : 'tests') + testImplementation 'com.fasterxml.jackson.core:jackson-databind' + testImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310' + testImplementation 'io.projectreactor:reactor-test' + testImplementation 'javax.xml.bind:jaxb-api' + testImplementation 'org.skyscreamer:jsonassert' + testImplementation 'org.springframework:spring-webmvc' + testImplementation 'org.springframework:spring-tx' + testImplementation powerMock2Dependencies } diff --git a/web/spring-security-web.gradle b/web/spring-security-web.gradle index 8a4e8efd8c..396a0c5336 100644 --- a/web/spring-security-web.gradle +++ b/web/spring-security-web.gradle @@ -1,13 +1,13 @@ apply plugin: 'io.spring.convention.spring-module' dependencies { - compile project(':spring-security-core') - compile springCoreDependency - compile 'org.springframework:spring-aop' - compile 'org.springframework:spring-beans' - compile 'org.springframework:spring-context' - compile 'org.springframework:spring-expression' - compile 'org.springframework:spring-web' + api project(':spring-security-core') + api springCoreDependency + api 'org.springframework:spring-aop' + api 'org.springframework:spring-beans' + api 'org.springframework:spring-context' + api 'org.springframework:spring-expression' + api 'org.springframework:spring-web' optional 'com.fasterxml.jackson.core:jackson-databind' optional 'io.projectreactor:reactor-core' @@ -18,14 +18,14 @@ dependencies { provided 'javax.servlet:javax.servlet-api' - testCompile project(path: ':spring-security-core', configuration: 'tests') - testCompile 'commons-codec:commons-codec' - testCompile 'io.projectreactor:reactor-test' - testCompile 'javax.xml.bind:jaxb-api' - testCompile 'org.skyscreamer:jsonassert' - testCompile 'org.springframework:spring-webflux' - testCompile 'org.synchronoss.cloud:nio-multipart-parser' - testCompile powerMock2Dependencies + testImplementation project(path: ':spring-security-core', configuration: 'tests') + testImplementation 'commons-codec:commons-codec' + testImplementation 'io.projectreactor:reactor-test' + testImplementation 'javax.xml.bind:jaxb-api' + testImplementation 'org.skyscreamer:jsonassert' + testImplementation 'org.springframework:spring-webflux' + testImplementation 'org.synchronoss.cloud:nio-multipart-parser' + testImplementation powerMock2Dependencies - testRuntime 'org.hsqldb:hsqldb' + testRuntimeOnly 'org.hsqldb:hsqldb' }