diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index fb6814cf1dc..9a3aaaec470 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -38,8 +38,8 @@ dependencies { management "com.google.appengine:appengine-testing:$gaeVersion" management "com.google.appengine:appengine:$gaeVersion" management "com.google.inject:guice:3.0" - management "com.nimbusds:nimbus-jose-jwt:9.+" - management "com.nimbusds:oauth2-oidc-sdk:$nimbusJoseJwtVersion" + management "com.nimbusds:nimbus-jose-jwt:$nimbusJoseJwtVersion" + management "com.nimbusds:oauth2-oidc-sdk:8.+" management "com.squareup.okhttp3:mockwebserver:3.14.+" management "com.squareup.okhttp3:okhttp:3.14.+" management "com.sun.xml.bind:jaxb-core:2.3.+" diff --git a/samples/boot/oauth2authorizationserver/spring-security-samples-boot-oauth2authorizationserver.gradle b/samples/boot/oauth2authorizationserver/spring-security-samples-boot-oauth2authorizationserver.gradle index 3b2df4e605f..d39496d5562 100644 --- a/samples/boot/oauth2authorizationserver/spring-security-samples-boot-oauth2authorizationserver.gradle +++ b/samples/boot/oauth2authorizationserver/spring-security-samples-boot-oauth2authorizationserver.gradle @@ -1,5 +1,7 @@ apply plugin: 'io.spring.convention.spring-sample-boot' +ext['nimbus-jose-jwt.version'] = nimbusJoseJwtVersion + dependencies { compile 'org.springframework.boot:spring-boot-starter-web' compile 'org.springframework.boot:spring-boot-starter-security' diff --git a/samples/boot/oauth2login-webflux/spring-security-samples-boot-oauth2login-webflux.gradle b/samples/boot/oauth2login-webflux/spring-security-samples-boot-oauth2login-webflux.gradle index 49099dbd7a8..f5414694046 100644 --- a/samples/boot/oauth2login-webflux/spring-security-samples-boot-oauth2login-webflux.gradle +++ b/samples/boot/oauth2login-webflux/spring-security-samples-boot-oauth2login-webflux.gradle @@ -1,5 +1,7 @@ apply plugin: 'io.spring.convention.spring-sample-boot' +ext['nimbus-jose-jwt.version'] = nimbusJoseJwtVersion + dependencies { compile project(':spring-security-config') compile project(':spring-security-oauth2-client') diff --git a/samples/boot/oauth2login/spring-security-samples-boot-oauth2login.gradle b/samples/boot/oauth2login/spring-security-samples-boot-oauth2login.gradle index ef3a4e27b56..249b3271da6 100644 --- a/samples/boot/oauth2login/spring-security-samples-boot-oauth2login.gradle +++ b/samples/boot/oauth2login/spring-security-samples-boot-oauth2login.gradle @@ -1,5 +1,7 @@ apply plugin: 'io.spring.convention.spring-sample-boot' +ext['nimbus-jose-jwt.version'] = nimbusJoseJwtVersion + dependencies { compile project(':spring-security-config') compile project(':spring-security-oauth2-client') diff --git a/samples/boot/oauth2resourceserver-jwe/spring-security-samples-boot-oauth2resourceserver-jwe.gradle b/samples/boot/oauth2resourceserver-jwe/spring-security-samples-boot-oauth2resourceserver-jwe.gradle index 8cfd42c93ca..dbb66c4f90b 100644 --- a/samples/boot/oauth2resourceserver-jwe/spring-security-samples-boot-oauth2resourceserver-jwe.gradle +++ b/samples/boot/oauth2resourceserver-jwe/spring-security-samples-boot-oauth2resourceserver-jwe.gradle @@ -1,10 +1,8 @@ apply plugin: 'io.spring.convention.spring-sample-boot' -dependencies { - constraints { - management "com.nimbusds:nimbus-jose-jwt:$nimbusJoseJwtVersion" - } +ext['nimbus-jose-jwt.version'] = nimbusJoseJwtVersion +dependencies { compile project(':spring-security-config') compile project(':spring-security-oauth2-jose') compile project(':spring-security-oauth2-resource-server') diff --git a/samples/boot/oauth2resourceserver-multitenancy/spring-security-samples-boot-oauth2resourceserver-multitenancy.gradle b/samples/boot/oauth2resourceserver-multitenancy/spring-security-samples-boot-oauth2resourceserver-multitenancy.gradle index 137e8a99924..cfd476be67f 100644 --- a/samples/boot/oauth2resourceserver-multitenancy/spring-security-samples-boot-oauth2resourceserver-multitenancy.gradle +++ b/samples/boot/oauth2resourceserver-multitenancy/spring-security-samples-boot-oauth2resourceserver-multitenancy.gradle @@ -1,10 +1,8 @@ apply plugin: 'io.spring.convention.spring-sample-boot' -dependencies { - constraints { - management "com.nimbusds:nimbus-jose-jwt:$nimbusJoseJwtVersion" - } +ext['nimbus-jose-jwt.version'] = nimbusJoseJwtVersion +dependencies { compile project(':spring-security-config') compile project(':spring-security-oauth2-jose') compile project(':spring-security-oauth2-resource-server') diff --git a/samples/boot/oauth2resourceserver-opaque/spring-security-samples-boot-oauth2resourceserver-opaque.gradle b/samples/boot/oauth2resourceserver-opaque/spring-security-samples-boot-oauth2resourceserver-opaque.gradle index 137e8a99924..cfd476be67f 100644 --- a/samples/boot/oauth2resourceserver-opaque/spring-security-samples-boot-oauth2resourceserver-opaque.gradle +++ b/samples/boot/oauth2resourceserver-opaque/spring-security-samples-boot-oauth2resourceserver-opaque.gradle @@ -1,10 +1,8 @@ apply plugin: 'io.spring.convention.spring-sample-boot' -dependencies { - constraints { - management "com.nimbusds:nimbus-jose-jwt:$nimbusJoseJwtVersion" - } +ext['nimbus-jose-jwt.version'] = nimbusJoseJwtVersion +dependencies { compile project(':spring-security-config') compile project(':spring-security-oauth2-jose') compile project(':spring-security-oauth2-resource-server') diff --git a/samples/boot/oauth2resourceserver-static/spring-security-samples-boot-oauth2resourceserver-static.gradle b/samples/boot/oauth2resourceserver-static/spring-security-samples-boot-oauth2resourceserver-static.gradle index 6260565cc43..75aded6b86a 100644 --- a/samples/boot/oauth2resourceserver-static/spring-security-samples-boot-oauth2resourceserver-static.gradle +++ b/samples/boot/oauth2resourceserver-static/spring-security-samples-boot-oauth2resourceserver-static.gradle @@ -1,10 +1,8 @@ apply plugin: 'io.spring.convention.spring-sample-boot' -dependencies { - constraints { - management "com.nimbusds:nimbus-jose-jwt:$nimbusJoseJwtVersion" - } +ext['nimbus-jose-jwt.version'] = nimbusJoseJwtVersion +dependencies { compile project(':spring-security-config') compile project(':spring-security-oauth2-jose') compile project(':spring-security-oauth2-resource-server') diff --git a/samples/boot/oauth2resourceserver-webflux/spring-security-samples-boot-oauth2resourceserver-webflux.gradle b/samples/boot/oauth2resourceserver-webflux/spring-security-samples-boot-oauth2resourceserver-webflux.gradle index a76f8ce07de..fdcb4a9fca4 100644 --- a/samples/boot/oauth2resourceserver-webflux/spring-security-samples-boot-oauth2resourceserver-webflux.gradle +++ b/samples/boot/oauth2resourceserver-webflux/spring-security-samples-boot-oauth2resourceserver-webflux.gradle @@ -1,10 +1,8 @@ apply plugin: 'io.spring.convention.spring-sample-boot' -dependencies { - constraints { - management "com.nimbusds:nimbus-jose-jwt:$nimbusJoseJwtVersion" - } +ext['nimbus-jose-jwt.version'] = nimbusJoseJwtVersion +dependencies { compile project(':spring-security-config') compile project(':spring-security-oauth2-jose') compile project(':spring-security-oauth2-client') diff --git a/samples/boot/oauth2resourceserver/spring-security-samples-boot-oauth2resourceserver.gradle b/samples/boot/oauth2resourceserver/spring-security-samples-boot-oauth2resourceserver.gradle index 8cfd42c93ca..dbb66c4f90b 100644 --- a/samples/boot/oauth2resourceserver/spring-security-samples-boot-oauth2resourceserver.gradle +++ b/samples/boot/oauth2resourceserver/spring-security-samples-boot-oauth2resourceserver.gradle @@ -1,10 +1,8 @@ apply plugin: 'io.spring.convention.spring-sample-boot' -dependencies { - constraints { - management "com.nimbusds:nimbus-jose-jwt:$nimbusJoseJwtVersion" - } +ext['nimbus-jose-jwt.version'] = nimbusJoseJwtVersion +dependencies { compile project(':spring-security-config') compile project(':spring-security-oauth2-jose') compile project(':spring-security-oauth2-resource-server') diff --git a/samples/boot/oauth2webclient-webflux/spring-security-samples-boot-oauth2webclient-webflux.gradle b/samples/boot/oauth2webclient-webflux/spring-security-samples-boot-oauth2webclient-webflux.gradle index 286f80a5818..856351d8c46 100644 --- a/samples/boot/oauth2webclient-webflux/spring-security-samples-boot-oauth2webclient-webflux.gradle +++ b/samples/boot/oauth2webclient-webflux/spring-security-samples-boot-oauth2webclient-webflux.gradle @@ -1,5 +1,7 @@ apply plugin: 'io.spring.convention.spring-sample-boot' +ext['nimbus-jose-jwt.version'] = nimbusJoseJwtVersion + dependencies { compile project(':spring-security-config') compile project(':spring-security-oauth2-client') diff --git a/samples/boot/oauth2webclient/spring-security-samples-boot-oauth2webclient.gradle b/samples/boot/oauth2webclient/spring-security-samples-boot-oauth2webclient.gradle index f65d82709c4..bec43192bc7 100644 --- a/samples/boot/oauth2webclient/spring-security-samples-boot-oauth2webclient.gradle +++ b/samples/boot/oauth2webclient/spring-security-samples-boot-oauth2webclient.gradle @@ -1,5 +1,7 @@ apply plugin: 'io.spring.convention.spring-sample-boot' +ext['nimbus-jose-jwt.version'] = nimbusJoseJwtVersion + dependencies { compile project(':spring-security-config') compile project(':spring-security-oauth2-client')