From 9ddf113fe444b72536710200344d051bf355128d Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Mon, 16 Oct 2023 14:17:38 -0400 Subject: [PATCH 01/11] Update to Spring Framework 5.3.30 Closes gh-1394 --- buildSrc/build.gradle | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 6518c1e5..a4505beb 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -23,5 +23,5 @@ dependencies { implementation "org.hidetake:gradle-ssh-plugin:2.10.1" implementation "org.jfrog.buildinfo:build-info-extractor-gradle:4.29.0" implementation "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1" - implementation "org.springframework:spring-core:5.3.28" + implementation "org.springframework:spring-core:5.3.30" } diff --git a/gradle.properties b/gradle.properties index f285b9fa..20308404 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ version=0.4.4-SNAPSHOT org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true org.gradle.caching=true -springFrameworkVersion=5.3.28 +springFrameworkVersion=5.3.30 springSecurityVersion=5.8.4 springJavaformatVersion=0.0.38 springJavaformatExcludePackages=org/springframework/security/config org/springframework/security/oauth2 From 4f09f9361979f9a9cd2a1362d7dc0124c8784e66 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Mon, 16 Oct 2023 14:19:29 -0400 Subject: [PATCH 02/11] Update to Spring Security 5.8.8 Closes gh-1395 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 20308404..61618319 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.30 -springSecurityVersion=5.8.4 +springSecurityVersion=5.8.8 springJavaformatVersion=0.0.38 springJavaformatExcludePackages=org/springframework/security/config org/springframework/security/oauth2 checkstyleToolVersion=8.34 From e0bc768ad11e7a6771d1a30706ac85716a526652 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Mon, 16 Oct 2023 14:35:14 -0400 Subject: [PATCH 03/11] Update to Spring Boot 2.7.16 Closes gh-1396 --- .../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 829f1cb9..50f52520 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.5") + implementation platform("org.springframework.boot:spring-boot-dependencies:2.7.16") 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 e5e9019c..93bd6a42 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.5" + id "org.springframework.boot" version "2.7.16" 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 73f08b99..15359bd6 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.5" + id "org.springframework.boot" version "2.7.16" 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 eb2fc75d..06d56313 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.5" + id "org.springframework.boot" version "2.7.16" 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 be5679aa..77c39790 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.5" + id "org.springframework.boot" version "2.7.16" 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 1396a47b..893579b1 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.5" + id "org.springframework.boot" version "2.7.16" id "io.spring.dependency-management" version "1.0.11.RELEASE" id "java" } From 2a48bf6831a53407c1e9b8e0ed0077ba16cc6cf2 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Mon, 16 Oct 2023 14:49:18 -0400 Subject: [PATCH 04/11] Release 0.4.4 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 61618319..89276ca3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=0.4.4-SNAPSHOT +version=0.4.4 org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true org.gradle.caching=true From 24d2a7c8dca7d4e2b22ae6fe5a5850f04a2132b1 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Mon, 16 Oct 2023 14:57:53 -0400 Subject: [PATCH 05/11] Next Development Version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 89276ca3..c52a4610 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=0.4.4 +version=0.4.5-SNAPSHOT org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true org.gradle.caching=true From d9562184ddd2ce0c59f23912acf21fb5cc1638da Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Mon, 16 Oct 2023 15:48:05 -0400 Subject: [PATCH 06/11] Update to Spring Framework 6.0.13 Closes gh-1397 --- buildSrc/build.gradle | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index d0e959b5..fa9b1365 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -23,5 +23,5 @@ dependencies { implementation "org.hidetake:gradle-ssh-plugin:2.10.1" implementation "org.jfrog.buildinfo:build-info-extractor-gradle:4.29.0" implementation "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1" - implementation "org.springframework:spring-core:6.0.10" + implementation "org.springframework:spring-core:6.0.13" } diff --git a/gradle.properties b/gradle.properties index cee76319..63768d7f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ version=1.0.4-SNAPSHOT org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true org.gradle.caching=true -springFrameworkVersion=6.0.10 +springFrameworkVersion=6.0.13 springSecurityVersion=6.0.4 springJavaformatVersion=0.0.38 springJavaformatExcludePackages=org/springframework/security/config org/springframework/security/oauth2 From c5d0267d54d714e6cde5a67af1be9cd6d76a2104 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Mon, 16 Oct 2023 15:48:23 -0400 Subject: [PATCH 07/11] Update to Spring Security 6.0.8 Closes gh-1398 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 63768d7f..6dc51a63 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=6.0.13 -springSecurityVersion=6.0.4 +springSecurityVersion=6.0.8 springJavaformatVersion=0.0.38 springJavaformatExcludePackages=org/springframework/security/config org/springframework/security/oauth2 checkstyleToolVersion=8.34 From e92206afbc0327d41faf566ad57dc3bb2b54a010 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Mon, 16 Oct 2023 15:55:20 -0400 Subject: [PATCH 08/11] Update to org.hsqldb:hsqldb 2.7.2 Closes gh-1399 --- 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 6b9ba997..b574b3ea 100644 --- a/dependencies/spring-authorization-server-dependencies.gradle +++ b/dependencies/spring-authorization-server-dependencies.gradle @@ -19,6 +19,6 @@ dependencies { 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" - api "org.hsqldb:hsqldb:2.7.1" + api "org.hsqldb:hsqldb:2.7.2" } } From 972c00bc8ce01e29198007695cb82b4ecb17967d Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Mon, 16 Oct 2023 15:57:07 -0400 Subject: [PATCH 09/11] Update to Spring Boot 3.0.11 Closes gh-1400 --- .../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 402a31ab..2531d2b6 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 @@ -12,7 +12,7 @@ repositories { } dependencies { - implementation platform("org.springframework.boot:spring-boot-dependencies:3.0.0") + implementation platform("org.springframework.boot:spring-boot-dependencies:3.0.11") 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 6465a94c..4804b135 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 "3.0.0" + id "org.springframework.boot" version "3.0.11" 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 341e0c20..64db0e8f 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 "3.0.0" + id "org.springframework.boot" version "3.0.11" 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 ab8c7583..34861a27 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 "3.0.0" + id "org.springframework.boot" version "3.0.11" 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 024b1b8b..2ca23625 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 "3.0.0" + id "org.springframework.boot" version "3.0.11" 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 fbfcaba8..e2fe10bd 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 "3.0.0" + id "org.springframework.boot" version "3.0.11" id "io.spring.dependency-management" version "1.0.11.RELEASE" id "java" } From bb6c9add229318d0138d65bf1647bec35924c702 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Mon, 16 Oct 2023 16:12:38 -0400 Subject: [PATCH 10/11] Release 1.0.4 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6dc51a63..cb2d8d23 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=1.0.4-SNAPSHOT +version=1.0.4 org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true org.gradle.caching=true From ddcbe5a1d9ecfbf454362bbf27374deb878d62d4 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Mon, 16 Oct 2023 16:28:30 -0400 Subject: [PATCH 11/11] Next Development Version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index cb2d8d23..412df46b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=1.0.4 +version=1.0.5-SNAPSHOT org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true org.gradle.caching=true