From 813bafdc21692ce379c4f3f1f4ba8bd8a87fb401 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 21 Feb 2023 09:48:25 -0500 Subject: [PATCH 1/8] Update to Spring Framework 5.3.25 Closes gh-1080 --- 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 2b94d850..6e541d15 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.24" + implementation "org.springframework:spring-core:5.3.25" } diff --git a/gradle.properties b/gradle.properties index e3e4f3f0..5e21ef7a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ version=0.4.1-SNAPSHOT org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true org.gradle.caching=true -springFrameworkVersion=5.3.24 +springFrameworkVersion=5.3.25 springSecurityVersion=5.8.0 springJavaformatVersion=0.0.31 springJavaformatExcludePackages=org/springframework/security/config org/springframework/security/oauth2 From 1c791c47561c7e6d057914388167fd54cc902e0a Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 21 Feb 2023 09:51:34 -0500 Subject: [PATCH 2/8] Update to Spring Security 5.8.2 Closes gh-1081 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5e21ef7a..3910f171 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.25 -springSecurityVersion=5.8.0 +springSecurityVersion=5.8.2 springJavaformatVersion=0.0.31 springJavaformatExcludePackages=org/springframework/security/config org/springframework/security/oauth2 checkstyleToolVersion=8.34 From a7b099bd74c76d168fdd2e2acb0a5454c62a96db Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 21 Feb 2023 10:04:08 -0500 Subject: [PATCH 3/8] Update to io.spring.nohttp:nohttp-checkstyle:0.0.11 Closes gh-1082 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3910f171..a90567c6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,5 +7,5 @@ springSecurityVersion=5.8.2 springJavaformatVersion=0.0.31 springJavaformatExcludePackages=org/springframework/security/config org/springframework/security/oauth2 checkstyleToolVersion=8.34 -nohttpCheckstyleVersion=0.0.10 +nohttpCheckstyleVersion=0.0.11 jacocoToolVersion=0.8.7 From 262246b508e3648d674aae995907c20a5b277e8c Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 21 Feb 2023 10:06:25 -0500 Subject: [PATCH 4/8] Update to io.spring.javaformat:spring-javaformat-checkstyle:0.0.35 Closes gh-1083 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a90567c6..9e351c75 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.parallel=true org.gradle.caching=true springFrameworkVersion=5.3.25 springSecurityVersion=5.8.2 -springJavaformatVersion=0.0.31 +springJavaformatVersion=0.0.35 springJavaformatExcludePackages=org/springframework/security/config org/springframework/security/oauth2 checkstyleToolVersion=8.34 nohttpCheckstyleVersion=0.0.11 From ca11e2921cf3a9883b7bfcb1a1f065b0f4951e27 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 21 Feb 2023 10:12:19 -0500 Subject: [PATCH 5/8] Update to jackson-bom:2.14.2 Closes gh-1084 --- 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 41b79dad..ef3d083b 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.14.0") + api platform("com.fasterxml.jackson:jackson-bom:2.14.2") constraints { api "com.nimbusds:nimbus-jose-jwt:9.24.4" api "javax.servlet:javax.servlet-api:4.0.1" From 2177c484df1e9bd0ad547ed24f0c24a86ec7fd32 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 21 Feb 2023 10:16:06 -0500 Subject: [PATCH 6/8] Update to junit-jupiter:5.9.2 Closes gh-1085 --- 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 ef3d083b..6d4c18ed 100644 --- a/dependencies/spring-authorization-server-dependencies.gradle +++ b/dependencies/spring-authorization-server-dependencies.gradle @@ -13,7 +13,7 @@ dependencies { constraints { api "com.nimbusds:nimbus-jose-jwt:9.24.4" api "javax.servlet:javax.servlet-api:4.0.1" - api "org.junit.jupiter:junit-jupiter:5.9.1" + api "org.junit.jupiter:junit-jupiter:5.9.2" api "org.assertj:assertj-core:3.23.1" api "org.mockito:mockito-core:4.8.1" api "com.squareup.okhttp3:mockwebserver:4.10.0" From 36dc37143ed830efb4bbcc6abbad065870fe7c8b Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 21 Feb 2023 10:57:52 -0500 Subject: [PATCH 7/8] Release 0.4.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9e351c75..5ec2558b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=0.4.1-SNAPSHOT +version=0.4.1 org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true org.gradle.caching=true From fc6bf6160eab532be4586b7fc2408b65b8290783 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 21 Feb 2023 11:11:48 -0500 Subject: [PATCH 8/8] Next Development Version --- git/hooks/prepare-forward-merge | 2 +- gradle.properties | 2 +- .../authorization/util/SpringAuthorizationServerVersion.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/git/hooks/prepare-forward-merge b/git/hooks/prepare-forward-merge index c32f023a..928c97d0 100755 --- a/git/hooks/prepare-forward-merge +++ b/git/hooks/prepare-forward-merge @@ -4,7 +4,7 @@ require 'net/http' require 'yaml' require 'logger' -$main_branch = "1.0.x" +$main_branch = "1.1.x" $log = Logger.new(STDOUT) $log.level = Logger::WARN diff --git a/gradle.properties b/gradle.properties index 5ec2558b..6a2df014 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=0.4.1 +version=0.4.2-SNAPSHOT org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true org.gradle.caching=true diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/util/SpringAuthorizationServerVersion.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/util/SpringAuthorizationServerVersion.java index 51946433..49d702e3 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/util/SpringAuthorizationServerVersion.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/util/SpringAuthorizationServerVersion.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 the original author or authors. + * Copyright 2020-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ package org.springframework.security.oauth2.server.authorization.util; public final class SpringAuthorizationServerVersion { private static final int MAJOR = 0; private static final int MINOR = 4; - private static final int PATCH = 1; + private static final int PATCH = 2; /** * Global Serialization value for Spring Authorization Server classes.