From 17c882c06d57712d86d7e7fa2eae948359c76b66 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 20 Sep 2022 14:16:32 -0400 Subject: [PATCH 1/9] Update to Spring Framework 5.3.23 Closes gh-898 --- 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 b8738624..a5fd3c59 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.26.1" implementation "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1" - implementation "org.springframework:spring-core:5.3.22" + implementation "org.springframework:spring-core:5.3.23" } diff --git a/gradle.properties b/gradle.properties index a0c020c9..007df2d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ version=0.4.0-SNAPSHOT org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true org.gradle.caching=true -springFrameworkVersion=5.3.22 +springFrameworkVersion=5.3.23 springSecurityVersion=5.8.0-M2 springJavaformatVersion=0.0.31 springJavaformatExcludePackages=org/springframework/security/config org/springframework/security/oauth2 From f114e3a1ce5cd83e0c510c1ff5ee4ae1ca66fa64 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 20 Sep 2022 14:17:12 -0400 Subject: [PATCH 2/9] Update to Spring Security 5.8.0-M3 Closes gh-899 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 007df2d9..8cb8680f 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-M2 +springSecurityVersion=5.8.0-M3 springJavaformatVersion=0.0.31 springJavaformatExcludePackages=org/springframework/security/config org/springframework/security/oauth2 checkstyleToolVersion=8.34 From 213bf495100c7bda7f0fd0bc60600b5e0ff1063d Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 20 Sep 2022 14:18:55 -0400 Subject: [PATCH 3/9] Update to nimbus-jose-jwt:9.24.4 Closes gh-900 --- 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 a8da2e64..4a576a0b 100644 --- a/dependencies/spring-authorization-server-dependencies.gradle +++ b/dependencies/spring-authorization-server-dependencies.gradle @@ -11,7 +11,7 @@ dependencies { api platform("org.springframework.security:spring-security-bom:$springSecurityVersion") api platform("com.fasterxml.jackson:jackson-bom:2.13.3") constraints { - api "com.nimbusds:nimbus-jose-jwt:9.23" + api "com.nimbusds:nimbus-jose-jwt:9.24.4" api "javax.servlet:javax.servlet-api:4.0.1" api "junit:junit:4.13.2" api "org.assertj:assertj-core:3.22.0" From b71801cd1eb229e82af4c45ab189c2ee79713b29 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 20 Sep 2022 14:23:55 -0400 Subject: [PATCH 4/9] Update to jackson-bom:2.13.4 Closes gh-901 --- 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 4a576a0b..a1d00460 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.3") + api platform("com.fasterxml.jackson:jackson-bom:2.13.4") constraints { api "com.nimbusds:nimbus-jose-jwt:9.24.4" api "javax.servlet:javax.servlet-api:4.0.1" From 1f68ad1655010f7b93a056db83aa0a08310373e8 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 20 Sep 2022 14:25:45 -0400 Subject: [PATCH 5/9] Update to assertj-core:3.23.1 Closes gh-902 --- 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 a1d00460..1689a205 100644 --- a/dependencies/spring-authorization-server-dependencies.gradle +++ b/dependencies/spring-authorization-server-dependencies.gradle @@ -14,7 +14,7 @@ dependencies { api "com.nimbusds:nimbus-jose-jwt:9.24.4" api "javax.servlet:javax.servlet-api:4.0.1" api "junit:junit:4.13.2" - api "org.assertj:assertj-core:3.22.0" + api "org.assertj:assertj-core:3.23.1" api "org.mockito:mockito-core:4.5.1" api "com.squareup.okhttp3:mockwebserver:4.9.3" api "com.squareup.okhttp3:okhttp:4.9.3" From 9c0ca08e68215e414f8621749b94ec4068733610 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 20 Sep 2022 14:27:17 -0400 Subject: [PATCH 6/9] Update to mockito-core:4.8.0 Closes gh-903 --- 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 1689a205..3e0771b4 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.5.1" + api "org.mockito:mockito-core:4.8.0" api "com.squareup.okhttp3:mockwebserver:4.9.3" api "com.squareup.okhttp3:okhttp:4.9.3" api "com.jayway.jsonpath:json-path:2.7.0" From dc142cb253cad232780bd4da8b49b35507fd8cc5 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 20 Sep 2022 14:31:08 -0400 Subject: [PATCH 7/9] Update to okhttp:4.10.0 Closes gh-904 --- dependencies/spring-authorization-server-dependencies.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies/spring-authorization-server-dependencies.gradle b/dependencies/spring-authorization-server-dependencies.gradle index 3e0771b4..50be5dbf 100644 --- a/dependencies/spring-authorization-server-dependencies.gradle +++ b/dependencies/spring-authorization-server-dependencies.gradle @@ -16,8 +16,8 @@ dependencies { api "junit:junit:4.13.2" api "org.assertj:assertj-core:3.23.1" api "org.mockito:mockito-core:4.8.0" - api "com.squareup.okhttp3:mockwebserver:4.9.3" - api "com.squareup.okhttp3:okhttp:4.9.3" + 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.5.2" } From 3729dc0d434543226d4a5f21fd845d3c02f42fe4 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 20 Sep 2022 14:55:14 -0400 Subject: [PATCH 8/9] Release 0.4.0-M2 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8cb8680f..84b95358 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=0.4.0-SNAPSHOT +version=0.4.0-M2 org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true org.gradle.caching=true From a9cf857d331cf70b7552445e40193a0140988895 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 20 Sep 2022 15:06:39 -0400 Subject: [PATCH 9/9] Next Development Version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 84b95358..8cb8680f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=0.4.0-M2 +version=0.4.0-SNAPSHOT org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true org.gradle.caching=true