From f26ab78ed789d0797a7dd2742a2cc88bc4eadf4e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 9 Feb 2024 09:57:56 +0000 Subject: [PATCH 01/14] Start building against Micrometer 1.12.3 snapshots See gh-39474 --- 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 9bc2ed236f..cf39b7be49 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -995,7 +995,7 @@ bom { ] } } - library("Micrometer", "1.12.2") { + library("Micrometer", "1.12.3-SNAPSHOT") { considerSnapshots() group("io.micrometer") { modules = [ From 3f02b632f8aeeec5b95c32c8841a51f56bdd7c93 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 9 Feb 2024 09:58:01 +0000 Subject: [PATCH 02/14] Start building against Micrometer Tracing 1.2.3 snapshots See gh-39475 --- 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 cf39b7be49..25a5ac4eae 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1008,7 +1008,7 @@ bom { ] } } - library("Micrometer Tracing", "1.2.2") { + library("Micrometer Tracing", "1.2.3-SNAPSHOT") { considerSnapshots() calendarName = "Tracing" group("io.micrometer") { From 316151bbf57996abf937561e620b75a37d331df7 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 9 Feb 2024 09:58:05 +0000 Subject: [PATCH 03/14] Start building against Reactor Bom 2023.0.3 snapshots See gh-39476 --- 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 25a5ac4eae..d3368ce0da 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1327,7 +1327,7 @@ bom { ] } } - library("Reactor Bom", "2023.0.2") { + library("Reactor Bom", "2023.0.3-SNAPSHOT") { considerSnapshots() calendarName = "Reactor" group("io.projectreactor") { From 29659738ce85d84e8a9cf06c20e199b09bfbbc87 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 9 Feb 2024 09:58:10 +0000 Subject: [PATCH 04/14] Start building against Spring AMQP 3.1.2 snapshots See gh-39477 --- 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 d3368ce0da..d8afa04ea8 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1495,7 +1495,7 @@ bom { ] } } - library("Spring AMQP", "3.1.1") { + library("Spring AMQP", "3.1.2-SNAPSHOT") { considerSnapshots() group("org.springframework.amqp") { imports = [ From e90e4c51e7403157f0982ee5057e956b1c3cf349 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 9 Feb 2024 09:58:15 +0000 Subject: [PATCH 05/14] Start building against Spring Authorization Server 1.2.2 snapshots See gh-39478 --- 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 d8afa04ea8..9ceaf00fa5 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1503,7 +1503,7 @@ bom { ] } } - library("Spring Authorization Server", "1.2.1") { + library("Spring Authorization Server", "1.2.2-SNAPSHOT") { considerSnapshots() group("org.springframework.security") { modules = [ From f527e9a6fcb04e6946be94ae141160f91d69d87c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 9 Feb 2024 09:58:19 +0000 Subject: [PATCH 06/14] Start building against Spring Batch 5.1.1 snapshots See gh-39479 --- 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 9ceaf00fa5..edae1dc62a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1511,7 +1511,7 @@ bom { ] } } - library("Spring Batch", "5.1.0") { + library("Spring Batch", "5.1.1-SNAPSHOT") { considerSnapshots() group("org.springframework.batch") { imports = [ From c58406c7a5de0c2d7228305f8afca0ccb092eb04 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 9 Feb 2024 09:58:24 +0000 Subject: [PATCH 07/14] Start building against Spring Data Bom 2023.1.3 snapshots See gh-39480 --- 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 edae1dc62a..32e85d92ff 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1519,7 +1519,7 @@ bom { ] } } - library("Spring Data Bom", "2023.1.2") { + library("Spring Data Bom", "2023.1.3-SNAPSHOT") { considerSnapshots() calendarName = "Spring Data Release" group("org.springframework.data") { From 4b37228cfaa5eaf638faeac306046839621e076c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 9 Feb 2024 09:58:29 +0000 Subject: [PATCH 08/14] Start building against Spring Framework 6.1.4 snapshots See gh-39481 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 28236114ec..d1786b540b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ junitJupiterVersion=5.10.1 kotlinVersion=1.9.22 mavenVersion=3.9.4 nativeBuildToolsVersion=0.9.28 -springFrameworkVersion=6.1.3 +springFrameworkVersion=6.1.4-SNAPSHOT tomcatVersion=10.1.18 kotlin.stdlib.default.dependency=false From dada1378bd847ab29492827d26c206b054c413ba Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 9 Feb 2024 09:58:34 +0000 Subject: [PATCH 09/14] Start building against Spring GraphQL 1.2.5 snapshots See gh-39482 --- ...raphQlWebMvcSecurityAutoConfigurationTests.java | 12 +++--------- .../GraphQlWebMvcAutoConfigurationTests.java | 14 ++++---------- .../spring-boot-dependencies/build.gradle | 2 +- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebMvcSecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebMvcSecurityAutoConfigurationTests.java index a7deb9a3af..45ea3fdcc8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebMvcSecurityAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebMvcSecurityAutoConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2023 the original author or authors. + * Copyright 2020-2024 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. @@ -46,14 +46,12 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.provisioning.InMemoryUserDetailsManager; import org.springframework.security.web.DefaultSecurityFilterChain; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.security.config.Customizer.withDefaults; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user; import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.asyncDispatch; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; @@ -84,8 +82,7 @@ class GraphQlWebMvcSecurityAutoConfigurationTests { void anonymousUserShouldBeUnauthorized() { testWith((mockMvc) -> { String query = "{ bookById(id: \\\"book-1\\\"){ id name pageCount author }}"; - MvcResult result = mockMvc.perform(post("/graphql").content("{\"query\": \"" + query + "\"}")).andReturn(); - mockMvc.perform(asyncDispatch(result)) + mockMvc.perform(post("/graphql").content("{\"query\": \"" + query + "\"}")) .andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON)) .andExpect(jsonPath("data.bookById.name").doesNotExist()) @@ -97,10 +94,7 @@ class GraphQlWebMvcSecurityAutoConfigurationTests { void authenticatedUserShouldGetData() { testWith((mockMvc) -> { String query = "{ bookById(id: \\\"book-1\\\"){ id name pageCount author }}"; - MvcResult result = mockMvc - .perform(post("/graphql").content("{\"query\": \"" + query + "\"}").with(user("rob"))) - .andReturn(); - mockMvc.perform(asyncDispatch(result)) + mockMvc.perform(post("/graphql").content("{\"query\": \"" + query + "\"}").with(user("rob"))) .andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON)) .andExpect(jsonPath("data.bookById.name").value("GraphQL for beginners")) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/servlet/GraphQlWebMvcAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/servlet/GraphQlWebMvcAutoConfigurationTests.java index 6df0fdff74..cd082e39ac 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/servlet/GraphQlWebMvcAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/servlet/GraphQlWebMvcAutoConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 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. @@ -43,7 +43,6 @@ import org.springframework.graphql.server.webmvc.GraphQlWebSocketHandler; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.function.RouterFunction; @@ -52,7 +51,6 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl import org.springframework.web.socket.server.support.WebSocketHandlerMapping; import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.asyncDispatch; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; @@ -88,8 +86,7 @@ class GraphQlWebMvcAutoConfigurationTests { void simpleQueryShouldWork() { testWith((mockMvc) -> { String query = "{ bookById(id: \\\"book-1\\\"){ id name pageCount author } }"; - MvcResult result = mockMvc.perform(post("/graphql").content("{\"query\": \"" + query + "\"}")).andReturn(); - mockMvc.perform(asyncDispatch(result)) + mockMvc.perform(post("/graphql").content("{\"query\": \"" + query + "\"}")) .andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_GRAPHQL_RESPONSE)) .andExpect(jsonPath("data.bookById.name").value("GraphQL for beginners")); @@ -120,8 +117,7 @@ class GraphQlWebMvcAutoConfigurationTests { void shouldConfigureWebInterceptors() { testWith((mockMvc) -> { String query = "{ bookById(id: \\\"book-1\\\"){ id name pageCount author } }"; - MvcResult result = mockMvc.perform(post("/graphql").content("{\"query\": \"" + query + "\"}")).andReturn(); - mockMvc.perform(asyncDispatch(result)) + mockMvc.perform(post("/graphql").content("{\"query\": \"" + query + "\"}")) .andExpect(status().isOk()) .andExpect(header().string("X-Custom-Header", "42")); }); @@ -152,12 +148,10 @@ class GraphQlWebMvcAutoConfigurationTests { testWith((mockMvc) -> { String query = "{" + " bookById(id: \\\"book-1\\\"){ " + " id" + " name" + " pageCount" + " author" + " }" + "}"; - MvcResult result = mockMvc + mockMvc .perform(post("/graphql").header(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "POST") .header(HttpHeaders.ORIGIN, "https://example.com") .content("{\"query\": \"" + query + "\"}")) - .andReturn(); - mockMvc.perform(asyncDispatch(result)) .andExpect(status().isOk()) .andExpect(header().stringValues(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN, "https://example.com")) .andExpect(header().stringValues(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS, "true")); diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 32e85d92ff..e16409cb83 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1537,7 +1537,7 @@ bom { ] } } - library("Spring GraphQL", "1.2.4") { + library("Spring GraphQL", "1.2.5-SNAPSHOT") { considerSnapshots() group("org.springframework.graphql") { modules = [ From 65a96b270d023f2f82f504d2d035ee644cdaeb05 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 9 Feb 2024 09:58:38 +0000 Subject: [PATCH 10/14] Start building against Spring Integration 6.2.2 snapshots See gh-39483 --- 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 e16409cb83..386bfb1f36 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1554,7 +1554,7 @@ bom { ] } } - library("Spring Integration", "6.2.1") { + library("Spring Integration", "6.2.2-SNAPSHOT") { considerSnapshots() group("org.springframework.integration") { imports = [ From b1d841dab83e78870fa5ea1acf2956b7b5c759d8 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 9 Feb 2024 09:58:43 +0000 Subject: [PATCH 11/14] Start building against Spring Kafka 3.1.2 snapshots See gh-39484 --- 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 386bfb1f36..006bb194f6 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1562,7 +1562,7 @@ bom { ] } } - library("Spring Kafka", "3.1.1") { + library("Spring Kafka", "3.1.2-SNAPSHOT") { considerSnapshots() group("org.springframework.kafka") { modules = [ From 3ab24c06631aacbd2e3dafdc7ef6b5216dd52d63 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 9 Feb 2024 09:58:48 +0000 Subject: [PATCH 12/14] Start building against Spring LDAP 3.2.2 snapshots See gh-39485 --- 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 006bb194f6..76089d58cb 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1571,7 +1571,7 @@ bom { ] } } - library("Spring LDAP", "3.2.1") { + library("Spring LDAP", "3.2.2-SNAPSHOT") { considerSnapshots() group("org.springframework.ldap") { modules = [ From 54201108145d36b9928efd31c6c6c21bec4dab82 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 9 Feb 2024 09:58:53 +0000 Subject: [PATCH 13/14] Start building against Spring Pulsar 1.0.3 snapshots See gh-39486 --- 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 76089d58cb..efdd56d572 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1582,7 +1582,7 @@ bom { ] } } - library("Spring Pulsar", "1.0.2") { + library("Spring Pulsar", "1.0.3-SNAPSHOT") { considerSnapshots() group("org.springframework.pulsar") { imports = [ From aa061696b1a825268fa713e824d1e63ff7aa25ad Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 9 Feb 2024 09:58:57 +0000 Subject: [PATCH 14/14] Start building against Spring Security 6.2.2 snapshots See gh-39487 --- 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 efdd56d572..3a02e99f5d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1606,7 +1606,7 @@ bom { ] } } - library("Spring Security", "6.2.1") { + library("Spring Security", "6.2.2-SNAPSHOT") { considerSnapshots() group("org.springframework.security") { imports = [