Преглед изворни кода

Downgrade nimbus-jose-jwt to 8.+

Closes gh-9399
Josh Cummings пре 4 година
родитељ
комит
e79141a188

+ 2 - 1
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.+"

+ 2 - 2
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;
 

+ 2 - 2
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;

+ 4 - 0
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')

+ 4 - 0
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')

+ 4 - 0
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')

+ 4 - 0
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')

+ 4 - 0
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')

+ 4 - 0
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')