Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Gradle configuration names 

Closes gh-9540
This commit is contained in:
Rob Winch 2021-04-04 07:31:47 -05:00
parent e4c03e9e5a
commit 1a76ee7442
30 changed files with 279 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
acl/spring-security-acl.gradle
View File

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

12
aspects/spring-security-aspects.gradle
View File

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

2
buildSrc/src/main/groovy/io/spring/gradle/convention/DependencySetPlugin.groovy
View File

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

16
cas/spring-security-cas.gradle
View File

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

78
config/spring-security-config.gradle
View File

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

26
core/spring-security-core.gradle
View File

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

8
data/spring-security-data.gradle
View File

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

8
docs/manual/spring-security-docs-manual.gradle
View File

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

22
itest/context/spring-security-itest-context.gradle
View File

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

18
itest/ldap/embedded-ldap-apacheds-default/spring-security-itest-ldap-embedded-apacheds-default.gradle
View File

@ -1,15 +1,15 @@
apply plugin: 'io.spring.convention.spring-test' apply plugin: 'io.spring.convention.spring-test'
dependencies { dependencies {
compile project(':spring-security-core') implementation project(':spring-security-core')
compile 'org.springframework:spring-beans' implementation 'org.springframework:spring-beans'
compile 'org.springframework:spring-context' implementation 'org.springframework:spring-context'
compile 'org.springframework:spring-core' implementation 'org.springframework:spring-core'
compile 'org.springframework:spring-tx' implementation 'org.springframework:spring-tx'
compile project(':spring-security-config') implementation project(':spring-security-config')
compile project(':spring-security-ldap') 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')
} }

18
itest/ldap/embedded-ldap-mode-apacheds/spring-security-itest-ldap-embedded-mode-apacheds.gradle
View File

@ -1,15 +1,15 @@
apply plugin: 'io.spring.convention.spring-test' apply plugin: 'io.spring.convention.spring-test'
dependencies { dependencies {
compile project(':spring-security-core') implementation project(':spring-security-core')
compile 'org.springframework:spring-beans' implementation 'org.springframework:spring-beans'
compile 'org.springframework:spring-context' implementation 'org.springframework:spring-context'
compile 'org.springframework:spring-core' implementation 'org.springframework:spring-core'
compile 'org.springframework:spring-tx' implementation 'org.springframework:spring-tx'
compile project(':spring-security-config') implementation project(':spring-security-config')
compile project(':spring-security-ldap') 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')
} }

16
itest/ldap/embedded-ldap-mode-unboundid/spring-security-itest-ldap-embedded-mode-unboundid.gradle
View File

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

14
itest/ldap/embedded-ldap-none/spring-security-itest-ldap-embedded-none.gradle
View File

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

16
itest/ldap/embedded-ldap-unboundid-default/spring-security-itest-ldap-embedded-unboundid-default.gradle
View File

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

20
itest/web/spring-security-itest-web.gradle
View File

@ -1,20 +1,20 @@
apply plugin: 'io.spring.convention.spring-test' apply plugin: 'io.spring.convention.spring-test'
dependencies { dependencies {
compile 'org.springframework:spring-context' implementation 'org.springframework:spring-context'
compile 'org.springframework:spring-web' implementation 'org.springframework:spring-web'
provided 'javax.servlet:javax.servlet-api' provided 'javax.servlet:javax.servlet-api'
testCompile project(':spring-security-core') testImplementation project(':spring-security-core')
testCompile project(':spring-security-test') testImplementation project(':spring-security-test')
testCompile project(':spring-security-web') testImplementation project(':spring-security-web')
testCompile 'org.springframework:spring-beans' testImplementation 'org.springframework:spring-beans'
testCompile 'org.springframework:spring-test' testImplementation 'org.springframework:spring-test'
testCompile 'org.springframework:spring-webmvc' testImplementation 'org.springframework:spring-webmvc'
testRuntime project(':spring-security-config') testRuntimeOnly project(':spring-security-config')
testRuntime project(':spring-security-ldap') testRuntimeOnly project(':spring-security-ldap')
} }
integrationTest { integrationTest {

18
ldap/spring-security-ldap.gradle
View File

@ -1,18 +1,18 @@
apply plugin: 'io.spring.convention.spring-module' apply plugin: 'io.spring.convention.spring-module'
dependencies { dependencies {
compile project(':spring-security-core') api project(':spring-security-core')
compile 'org.springframework:spring-beans' api 'org.springframework:spring-beans'
compile 'org.springframework:spring-context' api 'org.springframework:spring-context'
compile 'org.springframework:spring-core' api 'org.springframework:spring-core'
compile 'org.springframework:spring-tx' api 'org.springframework:spring-tx'
optional apachedsDependencies optional apachedsDependencies
optional 'ldapsdk:ldapsdk' optional 'ldapsdk:ldapsdk'
optional "com.unboundid:unboundid-ldapsdk" optional "com.unboundid:unboundid-ldapsdk"
optional 'org.apache.directory.shared:shared-ldap' 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: 'commons-logging', module: 'commons-logging')
exclude(group: 'org.springframework', module: 'spring-beans') exclude(group: 'org.springframework', module: 'spring-beans')
exclude(group: 'org.springframework', module: 'spring-core') exclude(group: 'org.springframework', module: 'spring-core')
@ -20,9 +20,9 @@ dependencies {
exclude(group: 'org.springframework.data', module: 'spring-data-commons') exclude(group: 'org.springframework.data', module: 'spring-data-commons')
} }
testCompile project(':spring-security-test') testImplementation project(':spring-security-test')
testCompile 'org.slf4j:jcl-over-slf4j' testImplementation 'org.slf4j:jcl-over-slf4j'
testCompile 'org.slf4j:slf4j-api' testImplementation 'org.slf4j:slf4j-api'
} }
integrationTest { integrationTest {

22
messaging/spring-security-messaging.gradle
View File

@ -1,22 +1,22 @@
apply plugin: 'io.spring.convention.spring-module' apply plugin: 'io.spring.convention.spring-module'
dependencies { dependencies {
compile project(':spring-security-core') api project(':spring-security-core')
compile 'org.springframework:spring-beans' api 'org.springframework:spring-beans'
compile 'org.springframework:spring-context' api 'org.springframework:spring-context'
compile 'org.springframework:spring-core' api 'org.springframework:spring-core'
compile 'org.springframework:spring-expression' api 'org.springframework:spring-expression'
compile 'org.springframework:spring-messaging' api 'org.springframework:spring-messaging'
optional project(':spring-security-web') optional project(':spring-security-web')
optional 'org.springframework:spring-websocket' optional 'org.springframework:spring-websocket'
optional 'io.projectreactor:reactor-core' optional 'io.projectreactor:reactor-core'
optional 'javax.servlet:javax.servlet-api' optional 'javax.servlet:javax.servlet-api'
testCompile project(path: ':spring-security-core', configuration: 'tests') testImplementation project(path: ':spring-security-core', configuration: 'tests')
testCompile 'commons-codec:commons-codec' testImplementation 'commons-codec:commons-codec'
testCompile powerMock2Dependencies testImplementation powerMock2Dependencies
testCompile slf4jDependencies testImplementation slf4jDependencies
testRuntime 'org.hsqldb:hsqldb' testRuntimeOnly 'org.hsqldb:hsqldb'
} }

32
oauth2/oauth2-client/spring-security-oauth2-client.gradle
View File

@ -1,11 +1,11 @@
apply plugin: 'io.spring.convention.spring-module' apply plugin: 'io.spring.convention.spring-module'
dependencies { dependencies {
compile project(':spring-security-core') api project(':spring-security-core')
compile project(':spring-security-oauth2-core') api project(':spring-security-oauth2-core')
compile project(':spring-security-web') api project(':spring-security-web')
compile springCoreDependency api springCoreDependency
compile 'com.nimbusds:oauth2-oidc-sdk' api 'com.nimbusds:oauth2-oidc-sdk'
optional project(':spring-security-oauth2-jose') optional project(':spring-security-oauth2-jose')
optional 'io.projectreactor:reactor-core' optional 'io.projectreactor:reactor-core'
@ -15,18 +15,18 @@ dependencies {
optional 'org.springframework:spring-jdbc' optional 'org.springframework:spring-jdbc'
optional 'org.springframework:spring-r2dbc' optional 'org.springframework:spring-r2dbc'
testCompile project(path: ':spring-security-oauth2-core', configuration: 'tests') testImplementation project(path: ':spring-security-oauth2-core', configuration: 'tests')
testCompile project(path: ':spring-security-oauth2-jose', configuration: 'tests') testImplementation project(path: ':spring-security-oauth2-jose', configuration: 'tests')
testCompile powerMock2Dependencies testImplementation powerMock2Dependencies
testCompile 'com.squareup.okhttp3:mockwebserver' testImplementation 'com.squareup.okhttp3:mockwebserver'
testCompile 'io.projectreactor.netty:reactor-netty' testImplementation 'io.projectreactor.netty:reactor-netty'
testCompile 'io.projectreactor:reactor-test' testImplementation 'io.projectreactor:reactor-test'
testCompile 'io.projectreactor.tools:blockhound' testImplementation 'io.projectreactor.tools:blockhound'
testCompile 'org.skyscreamer:jsonassert' testImplementation 'org.skyscreamer:jsonassert'
testCompile 'io.r2dbc:r2dbc-h2:0.8.4.RELEASE' testImplementation 'io.r2dbc:r2dbc-h2:0.8.4.RELEASE'
testCompile 'io.r2dbc:r2dbc-spi-test:0.8.3.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' provided 'javax.servlet:javax.servlet-api'
} }

8
oauth2/oauth2-core/spring-security-oauth2-core.gradle
View File

@ -1,13 +1,13 @@
apply plugin: 'io.spring.convention.spring-module' apply plugin: 'io.spring.convention.spring-module'
dependencies { dependencies {
compile project(':spring-security-core') api project(':spring-security-core')
compile springCoreDependency api springCoreDependency
compile 'org.springframework:spring-web' api 'org.springframework:spring-web'
optional 'com.fasterxml.jackson.core:jackson-databind' optional 'com.fasterxml.jackson.core:jackson-databind'
optional 'com.nimbusds:oauth2-oidc-sdk' optional 'com.nimbusds:oauth2-oidc-sdk'
optional 'org.springframework:spring-webflux' optional 'org.springframework:spring-webflux'
testCompile powerMock2Dependencies testImplementation powerMock2Dependencies
} }

16
oauth2/oauth2-jose/spring-security-oauth2-jose.gradle
View File

@ -1,16 +1,16 @@
apply plugin: 'io.spring.convention.spring-module' apply plugin: 'io.spring.convention.spring-module'
dependencies { dependencies {
compile project(':spring-security-core') api project(':spring-security-core')
compile project(':spring-security-oauth2-core') api project(':spring-security-oauth2-core')
compile springCoreDependency api springCoreDependency
compile 'com.nimbusds:nimbus-jose-jwt' api 'com.nimbusds:nimbus-jose-jwt'
optional 'io.projectreactor:reactor-core' optional 'io.projectreactor:reactor-core'
optional 'org.springframework:spring-webflux' optional 'org.springframework:spring-webflux'
testCompile powerMock2Dependencies testImplementation powerMock2Dependencies
testCompile 'com.squareup.okhttp3:mockwebserver' testImplementation 'com.squareup.okhttp3:mockwebserver'
testCompile 'io.projectreactor.netty:reactor-netty' testImplementation 'io.projectreactor.netty:reactor-netty'
testCompile 'com.fasterxml.jackson.core:jackson-databind' testImplementation 'com.fasterxml.jackson.core:jackson-databind'
} }

18
oauth2/oauth2-resource-server/spring-security-oauth2-resource-server.gradle
View File

@ -1,10 +1,10 @@
apply plugin: 'io.spring.convention.spring-module' apply plugin: 'io.spring.convention.spring-module'
dependencies { dependencies {
compile project(':spring-security-core') api project(':spring-security-core')
compile project(':spring-security-oauth2-core') api project(':spring-security-oauth2-core')
compile project(':spring-security-web') api project(':spring-security-web')
compile springCoreDependency api springCoreDependency
optional project(':spring-security-oauth2-jose') optional project(':spring-security-oauth2-jose')
optional 'com.nimbusds:oauth2-oidc-sdk' optional 'com.nimbusds:oauth2-oidc-sdk'
@ -13,9 +13,9 @@ dependencies {
provided 'javax.servlet:javax.servlet-api' provided 'javax.servlet:javax.servlet-api'
testCompile project(path: ':spring-security-oauth2-jose', configuration: 'tests') testImplementation project(path: ':spring-security-oauth2-jose', configuration: 'tests')
testCompile 'com.squareup.okhttp3:mockwebserver' testImplementation 'com.squareup.okhttp3:mockwebserver'
testCompile 'com.fasterxml.jackson.core:jackson-databind' testImplementation 'com.fasterxml.jackson.core:jackson-databind'
testCompile 'io.projectreactor.netty:reactor-netty' testImplementation 'io.projectreactor.netty:reactor-netty'
testCompile 'io.projectreactor:reactor-test' testImplementation 'io.projectreactor:reactor-test'
} }

22
openid/spring-security-openid.gradle
View File

@ -5,25 +5,25 @@
apply plugin: 'io.spring.convention.spring-module' apply plugin: 'io.spring.convention.spring-module'
dependencies { dependencies {
compile project(':spring-security-core') api project(':spring-security-core')
compile project(':spring-security-web') api project(':spring-security-web')
compile('com.google.inject:guice') { api('com.google.inject:guice') {
exclude group: 'aopalliance', module: 'aopalliance' exclude group: 'aopalliance', module: 'aopalliance'
} }
// openid4java has a compile time dep on guice with a group // openid4java has a compile time dep on guice with a group
// name which is different from the maven central one. // name which is different from the maven central one.
// We use the maven central version here instead. // 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' exclude group: 'com.google.code.guice', module: 'guice'
} }
compile 'org.springframework:spring-aop' api 'org.springframework:spring-aop'
compile 'org.springframework:spring-beans' api 'org.springframework:spring-beans'
compile 'org.springframework:spring-context' api 'org.springframework:spring-context'
compile 'org.springframework:spring-core' api 'org.springframework:spring-core'
compile 'org.springframework:spring-web' api 'org.springframework:spring-web'
provided 'javax.servlet:javax.servlet-api' provided 'javax.servlet:javax.servlet-api'
runtime 'net.sourceforge.nekohtml:nekohtml' runtimeOnly 'net.sourceforge.nekohtml:nekohtml'
runtime 'org.apache.httpcomponents:httpclient' runtimeOnly 'org.apache.httpcomponents:httpclient'
} }

14
remoting/spring-security-remoting.gradle
View File

@ -1,12 +1,12 @@
apply plugin: 'io.spring.convention.spring-module' apply plugin: 'io.spring.convention.spring-module'
dependencies { dependencies {
compile project(':spring-security-core') api project(':spring-security-core')
compile 'org.springframework:spring-aop' api 'org.springframework:spring-aop'
compile 'org.springframework:spring-beans' api 'org.springframework:spring-beans'
compile 'org.springframework:spring-context' api 'org.springframework:spring-context'
compile 'org.springframework:spring-core' api 'org.springframework:spring-core'
compile 'org.springframework:spring-web' api 'org.springframework:spring-web'
testCompile project(path: ':spring-security-core', configuration: 'tests') testImplementation project(path: ':spring-security-core', configuration: 'tests')
} }

6
rsocket/spring-security-rsocket.gradle
View File

@ -1,9 +1,9 @@
apply plugin: 'io.spring.convention.spring-module' apply plugin: 'io.spring.convention.spring-module'
dependencies { dependencies {
compile project(':spring-security-core') api project(':spring-security-core')
compile 'io.rsocket:rsocket-core' api 'io.rsocket:rsocket-core'
optional project(':spring-security-oauth2-resource-server') optional project(':spring-security-oauth2-resource-server')
optional 'org.springframework:spring-messaging' optional 'org.springframework:spring-messaging'
testCompile 'io.projectreactor:reactor-test' testImplementation 'io.projectreactor:reactor-test'
} }

6
saml2/saml2-service-provider/core/saml2-service-provider-core.gradle
View File

@ -40,8 +40,8 @@ dependencies {
management("org.opensaml:opensaml-saml-impl:3.+") management("org.opensaml:opensaml-saml-impl:3.+")
} }
compile project(':spring-security-core') api project(':spring-security-core')
compile project(':spring-security-web') api project(':spring-security-web')
provided("org.opensaml:opensaml-core") provided("org.opensaml:opensaml-core")
provided("org.opensaml:opensaml-saml-api") provided("org.opensaml:opensaml-saml-api")
@ -49,5 +49,5 @@ dependencies {
provided 'javax.servlet:javax.servlet-api' provided 'javax.servlet:javax.servlet-api'
testCompile 'com.squareup.okhttp3:mockwebserver' testImplementation 'com.squareup.okhttp3:mockwebserver'
} }

12
saml2/saml2-service-provider/opensaml3/saml2-service-provider-opensaml3.gradle
View File

@ -40,14 +40,14 @@ dependencies {
management("org.opensaml:opensaml-saml-impl:3.+") management("org.opensaml:opensaml-saml-impl:3.+")
} }
compile project(':saml2-service-provider-core') api project(':saml2-service-provider-core')
compile("org.opensaml:opensaml-core") api("org.opensaml:opensaml-core")
compile("org.opensaml:opensaml-saml-api") api("org.opensaml:opensaml-saml-api")
compile("org.opensaml:opensaml-saml-impl") api("org.opensaml:opensaml-saml-impl")
provided 'javax.servlet:javax.servlet-api' provided 'javax.servlet:javax.servlet-api'
testCompile 'com.squareup.okhttp3:mockwebserver' testImplementation 'com.squareup.okhttp3:mockwebserver'
testCompile project(path : ':saml2-service-provider-core', configuration : 'tests') testImplementation project(path : ':saml2-service-provider-core', configuration : 'tests')
} }

12
saml2/saml2-service-provider/opensaml4/saml2-service-provider-opensaml4.gradle
View File

@ -45,14 +45,14 @@ dependencies {
management("org.opensaml:opensaml-saml-impl:4.+") management("org.opensaml:opensaml-saml-impl:4.+")
} }
compile project(':saml2-service-provider-core') api project(':saml2-service-provider-core')
compile("org.opensaml:opensaml-core") api("org.opensaml:opensaml-core")
compile("org.opensaml:opensaml-saml-api") api("org.opensaml:opensaml-saml-api")
compile("org.opensaml:opensaml-saml-impl") api("org.opensaml:opensaml-saml-impl")
provided 'javax.servlet:javax.servlet-api' provided 'javax.servlet:javax.servlet-api'
testCompile 'com.squareup.okhttp3:mockwebserver' testImplementation 'com.squareup.okhttp3:mockwebserver'
testCompile project(path : ':saml2-service-provider-core', configuration : 'tests') testImplementation project(path : ':saml2-service-provider-core', configuration : 'tests')
} }

20
taglibs/spring-security-taglibs.gradle
View File

@ -1,20 +1,20 @@
apply plugin: 'io.spring.convention.spring-module' apply plugin: 'io.spring.convention.spring-module'
dependencies { dependencies {
compile project(':spring-security-acl') api project(':spring-security-acl')
compile project(':spring-security-core') api project(':spring-security-core')
compile project(':spring-security-web') api project(':spring-security-web')
compile 'org.springframework:spring-aop' api 'org.springframework:spring-aop'
compile 'org.springframework:spring-beans' api 'org.springframework:spring-beans'
compile 'org.springframework:spring-context' api 'org.springframework:spring-context'
compile 'org.springframework:spring-core' api 'org.springframework:spring-core'
compile 'org.springframework:spring-expression' api 'org.springframework:spring-expression'
compile 'org.springframework:spring-web' api 'org.springframework:spring-web'
provided 'javax.servlet.jsp:javax.servlet.jsp-api' provided 'javax.servlet.jsp:javax.servlet.jsp-api'
provided 'javax.servlet:javax.servlet-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)) { configure(project.tasks.withType(Test)) {

26
test/spring-security-test.gradle
View File

@ -1,10 +1,10 @@
apply plugin: 'io.spring.convention.spring-module' apply plugin: 'io.spring.convention.spring-module'
dependencies { dependencies {
compile project(':spring-security-core') api project(':spring-security-core')
compile project(':spring-security-web') api project(':spring-security-web')
compile 'org.springframework:spring-core' api 'org.springframework:spring-core'
compile 'org.springframework:spring-test' api 'org.springframework:spring-test'
optional project(':spring-security-config') optional project(':spring-security-config')
optional project(':spring-security-oauth2-client') optional project(':spring-security-oauth2-client')
@ -16,13 +16,13 @@ dependencies {
provided 'javax.servlet:javax.servlet-api' provided 'javax.servlet:javax.servlet-api'
testCompile project(path : ':spring-security-config', configuration : 'tests') testImplementation project(path : ':spring-security-config', configuration : 'tests')
testCompile 'com.fasterxml.jackson.core:jackson-databind' testImplementation 'com.fasterxml.jackson.core:jackson-databind'
testCompile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310' testImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
testCompile 'io.projectreactor:reactor-test' testImplementation 'io.projectreactor:reactor-test'
testCompile 'javax.xml.bind:jaxb-api' testImplementation 'javax.xml.bind:jaxb-api'
testCompile 'org.skyscreamer:jsonassert' testImplementation 'org.skyscreamer:jsonassert'
testCompile 'org.springframework:spring-webmvc' testImplementation 'org.springframework:spring-webmvc'
testCompile 'org.springframework:spring-tx' testImplementation 'org.springframework:spring-tx'
testCompile powerMock2Dependencies testImplementation powerMock2Dependencies
} }

32
web/spring-security-web.gradle
View File

@ -1,13 +1,13 @@
apply plugin: 'io.spring.convention.spring-module' apply plugin: 'io.spring.convention.spring-module'
dependencies { dependencies {
compile project(':spring-security-core') api project(':spring-security-core')
compile springCoreDependency api springCoreDependency
compile 'org.springframework:spring-aop' api 'org.springframework:spring-aop'
compile 'org.springframework:spring-beans' api 'org.springframework:spring-beans'
compile 'org.springframework:spring-context' api 'org.springframework:spring-context'
compile 'org.springframework:spring-expression' api 'org.springframework:spring-expression'
compile 'org.springframework:spring-web' api 'org.springframework:spring-web'
optional 'com.fasterxml.jackson.core:jackson-databind' optional 'com.fasterxml.jackson.core:jackson-databind'
optional 'io.projectreactor:reactor-core' optional 'io.projectreactor:reactor-core'
@ -18,14 +18,14 @@ dependencies {
provided 'javax.servlet:javax.servlet-api' provided 'javax.servlet:javax.servlet-api'
testCompile project(path: ':spring-security-core', configuration: 'tests') testImplementation project(path: ':spring-security-core', configuration: 'tests')
testCompile 'commons-codec:commons-codec' testImplementation 'commons-codec:commons-codec'
testCompile 'io.projectreactor:reactor-test' testImplementation 'io.projectreactor:reactor-test'
testCompile 'javax.xml.bind:jaxb-api' testImplementation 'javax.xml.bind:jaxb-api'
testCompile 'org.skyscreamer:jsonassert' testImplementation 'org.skyscreamer:jsonassert'
testCompile 'org.springframework:spring-webflux' testImplementation 'org.springframework:spring-webflux'
testCompile 'org.synchronoss.cloud:nio-multipart-parser' testImplementation 'org.synchronoss.cloud:nio-multipart-parser'
testCompile powerMock2Dependencies testImplementation powerMock2Dependencies
testRuntime 'org.hsqldb:hsqldb' testRuntimeOnly 'org.hsqldb:hsqldb'
} }