From 5bb43af3ff78bae7d36c64a67a52fa8bf34b0aa0 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 1 Nov 2022 05:06:18 -0400 Subject: [PATCH 1/6] Update to Spring Boot 2.7.5 Closes gh-948 --- .../examples/spring-authorization-server-docs-examples.gradle | 2 +- .../samples-custom-consent-authorizationserver.gradle | 2 +- .../samples-default-authorizationserver.gradle | 2 +- .../samples-federated-identity-authorizationserver.gradle | 2 +- samples/messages-client/samples-messages-client.gradle | 2 +- samples/messages-resource/samples-messages-resource.gradle | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/src/docs/asciidoc/examples/spring-authorization-server-docs-examples.gradle b/docs/src/docs/asciidoc/examples/spring-authorization-server-docs-examples.gradle index 9da0263a..829f1cb9 100644 --- a/docs/src/docs/asciidoc/examples/spring-authorization-server-docs-examples.gradle +++ b/docs/src/docs/asciidoc/examples/spring-authorization-server-docs-examples.gradle @@ -11,7 +11,7 @@ repositories { } dependencies { - implementation platform("org.springframework.boot:spring-boot-dependencies:2.7.0") + implementation platform("org.springframework.boot:spring-boot-dependencies:2.7.5") implementation "org.springframework.boot:spring-boot-starter-web" implementation "org.springframework.boot:spring-boot-starter-thymeleaf" implementation "org.springframework.boot:spring-boot-starter-security" diff --git a/samples/custom-consent-authorizationserver/samples-custom-consent-authorizationserver.gradle b/samples/custom-consent-authorizationserver/samples-custom-consent-authorizationserver.gradle index a08c49ed..dc53e637 100644 --- a/samples/custom-consent-authorizationserver/samples-custom-consent-authorizationserver.gradle +++ b/samples/custom-consent-authorizationserver/samples-custom-consent-authorizationserver.gradle @@ -1,5 +1,5 @@ plugins { - id "org.springframework.boot" version "2.7.0" + id "org.springframework.boot" version "2.7.5" id "io.spring.dependency-management" version "1.0.11.RELEASE" id "java" } diff --git a/samples/default-authorizationserver/samples-default-authorizationserver.gradle b/samples/default-authorizationserver/samples-default-authorizationserver.gradle index 68a05721..b813db03 100644 --- a/samples/default-authorizationserver/samples-default-authorizationserver.gradle +++ b/samples/default-authorizationserver/samples-default-authorizationserver.gradle @@ -1,5 +1,5 @@ plugins { - id "org.springframework.boot" version "2.7.0" + id "org.springframework.boot" version "2.7.5" id "io.spring.dependency-management" version "1.0.11.RELEASE" id "java" } diff --git a/samples/federated-identity-authorizationserver/samples-federated-identity-authorizationserver.gradle b/samples/federated-identity-authorizationserver/samples-federated-identity-authorizationserver.gradle index c0b2d0d7..eb2fc75d 100644 --- a/samples/federated-identity-authorizationserver/samples-federated-identity-authorizationserver.gradle +++ b/samples/federated-identity-authorizationserver/samples-federated-identity-authorizationserver.gradle @@ -1,5 +1,5 @@ plugins { - id "org.springframework.boot" version "2.7.0" + id "org.springframework.boot" version "2.7.5" id "io.spring.dependency-management" version "1.0.11.RELEASE" id "java" } diff --git a/samples/messages-client/samples-messages-client.gradle b/samples/messages-client/samples-messages-client.gradle index 47948cf9..be5679aa 100644 --- a/samples/messages-client/samples-messages-client.gradle +++ b/samples/messages-client/samples-messages-client.gradle @@ -1,5 +1,5 @@ plugins { - id "org.springframework.boot" version "2.7.0" + id "org.springframework.boot" version "2.7.5" id "io.spring.dependency-management" version "1.0.11.RELEASE" id "java" } diff --git a/samples/messages-resource/samples-messages-resource.gradle b/samples/messages-resource/samples-messages-resource.gradle index e72e82f7..1396a47b 100644 --- a/samples/messages-resource/samples-messages-resource.gradle +++ b/samples/messages-resource/samples-messages-resource.gradle @@ -1,5 +1,5 @@ plugins { - id "org.springframework.boot" version "2.7.0" + id "org.springframework.boot" version "2.7.5" id "io.spring.dependency-management" version "1.0.11.RELEASE" id "java" } From 32c53e53daebedf55db9fbb73d262f590343ad73 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 1 Nov 2022 05:11:17 -0400 Subject: [PATCH 2/6] Update to Spring Security 5.8.0-RC1 Closes gh-949 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8cb8680f..f27b240c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true org.gradle.caching=true springFrameworkVersion=5.3.23 -springSecurityVersion=5.8.0-M3 +springSecurityVersion=5.8.0-RC1 springJavaformatVersion=0.0.31 springJavaformatExcludePackages=org/springframework/security/config org/springframework/security/oauth2 checkstyleToolVersion=8.34 From 836acf7c0ea216862c3daa8f112d0b64f0644d10 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 1 Nov 2022 05:20:44 -0400 Subject: [PATCH 3/6] Update to jackson-bom:2.13.4.20221013 Closes gh-950 --- dependencies/spring-authorization-server-dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/spring-authorization-server-dependencies.gradle b/dependencies/spring-authorization-server-dependencies.gradle index 50be5dbf..50d0f2b5 100644 --- a/dependencies/spring-authorization-server-dependencies.gradle +++ b/dependencies/spring-authorization-server-dependencies.gradle @@ -9,7 +9,7 @@ javaPlatform { dependencies { api platform("org.springframework:spring-framework-bom:$springFrameworkVersion") api platform("org.springframework.security:spring-security-bom:$springSecurityVersion") - api platform("com.fasterxml.jackson:jackson-bom:2.13.4") + api platform("com.fasterxml.jackson:jackson-bom:2.13.4.20221013") constraints { api "com.nimbusds:nimbus-jose-jwt:9.24.4" api "javax.servlet:javax.servlet-api:4.0.1" From 1a6a9dd1f24ad799a0817be00d4aa343f1d911b2 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 1 Nov 2022 05:24:34 -0400 Subject: [PATCH 4/6] Update to mockito-core:4.8.1 Closes gh-951 --- dependencies/spring-authorization-server-dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/spring-authorization-server-dependencies.gradle b/dependencies/spring-authorization-server-dependencies.gradle index 50d0f2b5..a9d20072 100644 --- a/dependencies/spring-authorization-server-dependencies.gradle +++ b/dependencies/spring-authorization-server-dependencies.gradle @@ -15,7 +15,7 @@ dependencies { api "javax.servlet:javax.servlet-api:4.0.1" api "junit:junit:4.13.2" api "org.assertj:assertj-core:3.23.1" - api "org.mockito:mockito-core:4.8.0" + api "org.mockito:mockito-core:4.8.1" api "com.squareup.okhttp3:mockwebserver:4.10.0" api "com.squareup.okhttp3:okhttp:4.10.0" api "com.jayway.jsonpath:json-path:2.7.0" From b47d5ebb72c9ea76574d5b7c027c448e018c26ac Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 1 Nov 2022 09:45:37 -0400 Subject: [PATCH 5/6] Release 0.4.0-RC1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f27b240c..5852809e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=0.4.0-SNAPSHOT +version=0.4.0-RC1 org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true org.gradle.caching=true From 70466b74d851e36bdedfa4e8f502c0bee0fd08fc Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 1 Nov 2022 09:57:42 -0400 Subject: [PATCH 6/6] Next Development Version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5852809e..f27b240c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=0.4.0-RC1 +version=0.4.0-SNAPSHOT org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true org.gradle.caching=true