From e79141a1888da237f55d53237b8294ea3397c76b Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Wed, 3 Feb 2021 13:03:29 -0700 Subject: [PATCH] Downgrade nimbus-jose-jwt to 8.+ Closes gh-9399 --- gradle/dependency-management.gradle | 3 ++- .../oauth2/core/converter/ClaimConversionServiceTests.java | 4 ++-- .../oauth2/core/converter/ClaimTypeConverterTests.java | 4 ++-- ...ring-security-samples-boot-oauth2resourceserver-jwe.gradle | 4 ++++ ...rity-samples-boot-oauth2resourceserver-multitenancy.gradle | 4 ++++ ...g-security-samples-boot-oauth2resourceserver-opaque.gradle | 4 ++++ ...g-security-samples-boot-oauth2resourceserver-static.gradle | 4 ++++ ...-security-samples-boot-oauth2resourceserver-webflux.gradle | 4 ++++ .../spring-security-samples-boot-oauth2resourceserver.gradle | 4 ++++ 9 files changed, 30 insertions(+), 5 deletions(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 852d160d55..fb6814cf1d 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -21,6 +21,7 @@ if (!project.hasProperty("locksDisabled")) { } } ext.openSamlVersion = "3.4.+" +ext.nimbusJoseJwtVersion = '8.+' dependencies { management platform("org.springframework:spring-framework-bom:$springVersion") @@ -38,7 +39,7 @@ dependencies { 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:8.+" + management "com.nimbusds:oauth2-oidc-sdk:$nimbusJoseJwtVersion" 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/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/converter/ClaimConversionServiceTests.java b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/converter/ClaimConversionServiceTests.java index f77687a428..175aa02167 100644 --- a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/converter/ClaimConversionServiceTests.java +++ b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/converter/ClaimConversionServiceTests.java @@ -26,8 +26,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.nimbusds.jose.shaded.json.JSONArray; -import com.nimbusds.jose.shaded.json.JSONObject; +import net.minidev.json.JSONArray; +import net.minidev.json.JSONObject; import org.assertj.core.util.Lists; import org.junit.Test; diff --git a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/converter/ClaimTypeConverterTests.java b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/converter/ClaimTypeConverterTests.java index 2a1f329df1..3512a3c997 100644 --- a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/converter/ClaimTypeConverterTests.java +++ b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/converter/ClaimTypeConverterTests.java @@ -23,8 +23,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.nimbusds.jose.shaded.json.JSONArray; -import com.nimbusds.jose.shaded.json.JSONObject; +import net.minidev.json.JSONArray; +import net.minidev.json.JSONObject; import org.assertj.core.util.Lists; import org.assertj.core.util.Maps; import org.junit.Before; 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 2135bb0af6..8cfd42c93c 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,6 +1,10 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { + constraints { + management "com.nimbusds:nimbus-jose-jwt:$nimbusJoseJwtVersion" + } + 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 9074842b18..137e8a9992 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,6 +1,10 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { + constraints { + management "com.nimbusds:nimbus-jose-jwt:$nimbusJoseJwtVersion" + } + 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 9074842b18..137e8a9992 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,6 +1,10 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { + constraints { + management "com.nimbusds:nimbus-jose-jwt:$nimbusJoseJwtVersion" + } + 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 faba0d5f46..6260565cc4 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,6 +1,10 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { + constraints { + management "com.nimbusds:nimbus-jose-jwt:$nimbusJoseJwtVersion" + } + 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 0d92aef8de..a76f8ce07d 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,6 +1,10 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { + constraints { + management "com.nimbusds:nimbus-jose-jwt:$nimbusJoseJwtVersion" + } + 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 2135bb0af6..8cfd42c93c 100644 --- a/samples/boot/oauth2resourceserver/spring-security-samples-boot-oauth2resourceserver.gradle +++ b/samples/boot/oauth2resourceserver/spring-security-samples-boot-oauth2resourceserver.gradle @@ -1,6 +1,10 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { + constraints { + management "com.nimbusds:nimbus-jose-jwt:$nimbusJoseJwtVersion" + } + compile project(':spring-security-config') compile project(':spring-security-oauth2-jose') compile project(':spring-security-oauth2-resource-server')