From 538aad723a0e82c024fed0fff6a8606c97827edd Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 5 Jun 2023 17:41:21 +0100 Subject: [PATCH 01/11] Start building against Micrometer 1.10.8 snapshots See gh-35734 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 190b6134315..84209880aaa 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -946,7 +946,7 @@ bom { ] } } - library("Micrometer", "1.10.7") { + library("Micrometer", "1.10.8-SNAPSHOT") { group("io.micrometer") { modules = [ "micrometer-registry-stackdriver" { From c07d8bef1776dd1eb370faca894c75b637a6bab3 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 5 Jun 2023 17:41:26 +0100 Subject: [PATCH 02/11] Start building against Micrometer Tracing 1.0.7 snapshots See gh-35735 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 84209880aaa..058eb8fb8c5 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -958,7 +958,7 @@ bom { ] } } - library("Micrometer Tracing", "1.0.6") { + library("Micrometer Tracing", "1.0.7-SNAPSHOT") { group("io.micrometer") { imports = [ "micrometer-tracing-bom" From 31f0a69469ac84d0244f63c1a1f909036c24a996 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 5 Jun 2023 17:41:31 +0100 Subject: [PATCH 03/11] Start building against Reactor Bom 2022.0.8 snapshots See gh-35736 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 058eb8fb8c5..302ac07a3d5 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1155,7 +1155,7 @@ bom { ] } } - library("Reactor Bom", "2022.0.7") { + library("Reactor Bom", "2022.0.8-SNAPSHOT") { group("io.projectreactor") { imports = [ "reactor-bom" From 225fa6fbb5988c91f858412be421f3ee6d235ac6 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 5 Jun 2023 17:41:36 +0100 Subject: [PATCH 04/11] Start building against Spring AMQP 3.0.5 snapshots See gh-35737 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 302ac07a3d5..1f947757061 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1330,7 +1330,7 @@ bom { ] } } - library("Spring AMQP", "3.0.4") { + library("Spring AMQP", "3.0.5-SNAPSHOT") { group("org.springframework.amqp") { modules = [ "spring-amqp", From d8078f1c1291a08457520d1adf083238cf68d8dd Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 5 Jun 2023 17:41:42 +0100 Subject: [PATCH 05/11] Start building against Spring Data Bom 2022.0.7 snapshots See gh-35738 --- .../boot/autoconfigure/cache/CacheAutoConfigurationTests.java | 2 +- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java index d5e780b67ec..2c887c890bd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java @@ -770,7 +770,7 @@ class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationTests { } private RedisCacheConfiguration getDefaultRedisCacheConfiguration(RedisCacheManager cacheManager) { - return (RedisCacheConfiguration) ReflectionTestUtils.getField(cacheManager, "defaultCacheConfig"); + return (RedisCacheConfiguration) ReflectionTestUtils.getField(cacheManager, "defaultCacheConfiguration"); } @Configuration(proxyBeanMethods = false) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 1f947757061..e33030c4e30 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1348,7 +1348,7 @@ bom { ] } } - library("Spring Data Bom", "2022.0.6") { + library("Spring Data Bom", "2022.0.7-SNAPSHOT") { group("org.springframework.data") { imports = [ "spring-data-bom" From 22e8a41efa6848e38ce889227f54ce32563db686 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 5 Jun 2023 17:41:47 +0100 Subject: [PATCH 06/11] Start building against Spring Framework 6.0.10 snapshots This reverts commit 9d56b419 as Framework's previous behavior has been restored. See gh-35739 --- gradle.properties | 2 +- .../boot/context/properties/bind/MapBinderTests.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 578a23b82ad..a11945935df 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.7.22 nativeBuildToolsVersion=0.9.22 -springFrameworkVersion=6.0.9 +springFrameworkVersion=6.0.10-SNAPSHOT tomcatVersion=10.1.8 kotlin.stdlib.default.dependency=false diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java index c15ae41b818..7b86c969206 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java @@ -24,7 +24,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Properties; -import java.util.SortedMap; import java.util.stream.Collectors; import org.junit.jupiter.api.Test; @@ -245,7 +244,7 @@ class MapBinderTests { existing.put("baz", 1001); Bindable> target = STRING_INTEGER_MAP.withExistingValue(existing); Map result = this.binder.bind("foo", target).get(); - assertThat(result).isInstanceOf(HashMap.class); + assertThat(result).isExactlyInstanceOf(HashMap.class); assertThat(result).hasSize(2); assertThat(result).containsEntry("bar", 1); assertThat(result).containsEntry("baz", 1001); @@ -254,10 +253,10 @@ class MapBinderTests { @Test void bindToMapShouldRespectMapType() { this.sources.add(new MockConfigurationPropertySource("foo.bar", "1")); - ResolvableType type = ResolvableType.forClassWithGenerics(SortedMap.class, String.class, Integer.class); + ResolvableType type = ResolvableType.forClassWithGenerics(HashMap.class, String.class, Integer.class); Object defaultMap = this.binder.bind("foo", STRING_INTEGER_MAP).get(); Object customMap = this.binder.bind("foo", Bindable.of(type)).get(); - assertThat(customMap).isInstanceOf(SortedMap.class).isNotInstanceOf(defaultMap.getClass()); + assertThat(customMap).isExactlyInstanceOf(HashMap.class).isNotInstanceOf(defaultMap.getClass()); } @Test From 3960f8630d1a46f3d44d35c4acd292846825b9c3 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 5 Jun 2023 17:41:51 +0100 Subject: [PATCH 07/11] Start building against Spring Integration 6.0.6 snapshots See gh-35740 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index e33030c4e30..8c11c1aaf2e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1377,7 +1377,7 @@ bom { ] } } - library("Spring Integration", "6.0.5") { + library("Spring Integration", "6.0.6-SNAPSHOT") { group("org.springframework.integration") { imports = [ "spring-integration-bom" From 185ca73445dbb97413d34a7a9f8d4746e1a273ed Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 5 Jun 2023 17:41:56 +0100 Subject: [PATCH 08/11] Start building against Spring LDAP 3.0.4 snapshots See gh-35741 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 8c11c1aaf2e..6153f8395d0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1392,7 +1392,7 @@ bom { ] } } - library("Spring LDAP", "3.0.3") { + library("Spring LDAP", "3.0.4-SNAPSHOT") { group("org.springframework.ldap") { modules = [ "spring-ldap-core", From e670a091d70642aa82a412dacbf8d0245b55be8c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 5 Jun 2023 17:42:01 +0100 Subject: [PATCH 09/11] Start building against Spring Retry 2.0.2 snapshots See gh-35742 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 6153f8395d0..f2cdc7e68a1 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1409,7 +1409,7 @@ bom { ] } } - library("Spring Retry", "2.0.1") { + library("Spring Retry", "2.0.2-SNAPSHOT") { group("org.springframework.retry") { modules = [ "spring-retry" From b4fc9d6c501852b9c9d96980f1c190abcb54b10e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 5 Jun 2023 17:42:06 +0100 Subject: [PATCH 10/11] Start building against Spring Security 6.0.4 snapshots See gh-35743 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index f2cdc7e68a1..28da0bd8669 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1416,7 +1416,7 @@ bom { ] } } - library("Spring Security", "6.0.3") { + library("Spring Security", "6.0.4-SNAPSHOT") { group("org.springframework.security") { imports = [ "spring-security-bom" From d32c7c52b7ebd3bdf1e971b4afba3da3310a203e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 5 Jun 2023 17:42:11 +0100 Subject: [PATCH 11/11] Start building against Spring Session 3.0.2 snapshots See gh-35744 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 28da0bd8669..3bde109d9d6 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1423,7 +1423,7 @@ bom { ] } } - library("Spring Session", "3.0.1") { + library("Spring Session", "3.0.2-SNAPSHOT") { prohibit { startsWith(["Apple-", "Bean-", "Corn-", "Dragonfruit-"]) because "Spring Session switched to numeric version numbers"