From a8e8ad420548e58a3d9668a0c74079c243e4dcd7 Mon Sep 17 00:00:00 2001 From: Steve Riesenberg Date: Tue, 22 Mar 2022 08:40:48 -0500 Subject: [PATCH 1/3] Update spring-data-bom to 2022.0.0-M3 Closes gh-11017 --- dependencies/spring-security-dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/spring-security-dependencies.gradle b/dependencies/spring-security-dependencies.gradle index cc80074db3..ab5f98bf4d 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -11,7 +11,7 @@ dependencies { api platform("io.projectreactor:reactor-bom:2020.0.17") api platform("io.rsocket:rsocket-bom:1.1.1") api platform("org.junit:junit-bom:5.8.2") - api platform("org.springframework.data:spring-data-bom:2022.0.0-M1") + api platform("org.springframework.data:spring-data-bom:2022.0.0-M3") api platform("org.jetbrains.kotlin:kotlin-bom:$kotlinVersion") api platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.0") api platform("com.fasterxml.jackson:jackson-bom:2.13.2") From 6dbba7b4a8464c6a90a9cd7a6e61924de53cd62f Mon Sep 17 00:00:00 2001 From: Steve Riesenberg Date: Tue, 22 Mar 2022 10:55:59 -0500 Subject: [PATCH 2/3] Release 6.0.0-M3 --- docs/antora.yml | 4 ++-- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 524506a18f..dc7674a55b 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -1,5 +1,5 @@ name: ROOT -version: '6.0.0-M2' +version: '6.0.0-M3' prerelease: 'true' -display_version: '6.0.0-M2' +display_version: '6.0.0-M3' diff --git a/gradle.properties b/gradle.properties index b553f34f7c..41f341304e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ springJavaformatVersion=0.0.31 springBootVersion=2.4.2 springFrameworkVersion=6.0.0-M2 openSamlVersion=3.4.6 -version=6.0.0-M2 +version=6.0.0-M3 kotlinVersion=1.6.20-M1 samplesBranch=6.0.x org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError From e116bea11822738020e1c396581ddb58a5e84743 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 22 Mar 2022 18:18:13 +0000 Subject: [PATCH 3/3] Next development version --- docs/antora.yml | 5 ++--- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index dc7674a55b..077151a1ac 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -1,5 +1,4 @@ name: ROOT -version: '6.0.0-M3' -prerelease: 'true' -display_version: '6.0.0-M3' +version: '6.0.0' +prerelease: '-SNAPSHOT' diff --git a/gradle.properties b/gradle.properties index 41f341304e..c4b3f2a8ad 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ springJavaformatVersion=0.0.31 springBootVersion=2.4.2 springFrameworkVersion=6.0.0-M2 openSamlVersion=3.4.6 -version=6.0.0-M3 +version=6.0.0-SNAPSHOT kotlinVersion=1.6.20-M1 samplesBranch=6.0.x org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError