From d941f62a7329ec59f621515ff26a8e20ebe9354c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 8 Feb 2024 13:29:04 +0000 Subject: [PATCH 01/13] Start building against Micrometer 1.11.9 snapshots See gh-39454 --- 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 a1ab09cc85..3e3cad008c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -975,7 +975,7 @@ bom { ] } } - library("Micrometer", "1.11.8") { + library("Micrometer", "1.11.9-SNAPSHOT") { considerSnapshots() group("io.micrometer") { modules = [ From 5b0b327acb64f2a3fd4269a76b3974a6bfffaed9 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 8 Feb 2024 13:29:08 +0000 Subject: [PATCH 02/13] Start building against Micrometer Tracing 1.1.10 snapshots See gh-39455 --- 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 3e3cad008c..e9490eb7dd 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -988,7 +988,7 @@ bom { ] } } - library("Micrometer Tracing", "1.1.9") { + library("Micrometer Tracing", "1.1.10-SNAPSHOT") { considerSnapshots() calendarName = "Tracing" group("io.micrometer") { From 9bf17cca7f7497175e72a33509e596d24184793a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 8 Feb 2024 13:29:13 +0000 Subject: [PATCH 03/13] Start building against Reactor Bom 2022.0.16 snapshots See gh-39456 --- 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 e9490eb7dd..2e11894345 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1217,7 +1217,7 @@ bom { ] } } - library("Reactor Bom", "2022.0.15") { + library("Reactor Bom", "2022.0.16-SNAPSHOT") { considerSnapshots() calendarName = "Reactor" group("io.projectreactor") { From d402d0ecfd2b069ae7e6b56f8473f5d59b9bfbe4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 8 Feb 2024 13:29:18 +0000 Subject: [PATCH 04/13] Start building against Spring AMQP 3.0.11 snapshots See gh-39457 --- 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 2e11894345..d3ab68f72a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1382,7 +1382,7 @@ bom { ] } } - library("Spring AMQP", "3.0.10") { + library("Spring AMQP", "3.0.11-SNAPSHOT") { considerSnapshots() group("org.springframework.amqp") { imports = [ From 559aad31758856d3ed040355f2918abbbf3957cd Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 8 Feb 2024 13:29:22 +0000 Subject: [PATCH 05/13] Start building against Spring Authorization Server 1.1.5 snapshots See gh-39458 --- 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 d3ab68f72a..516c70e831 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1390,7 +1390,7 @@ bom { ] } } - library("Spring Authorization Server", "1.1.4") { + library("Spring Authorization Server", "1.1.5-SNAPSHOT") { considerSnapshots() group("org.springframework.security") { modules = [ From 50d66a9844f32e0f13257b64cba7f2d89285cafd Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 8 Feb 2024 13:29:27 +0000 Subject: [PATCH 06/13] Start building against Spring Batch 5.0.5 snapshots See gh-39459 --- 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 516c70e831..371562aba1 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1398,7 +1398,7 @@ bom { ] } } - library("Spring Batch", "5.0.4") { + library("Spring Batch", "5.0.5-SNAPSHOT") { considerSnapshots() group("org.springframework.batch") { imports = [ From 7efdf0a428a41f6a2273758398e52a526f2e35ad Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 8 Feb 2024 13:29:32 +0000 Subject: [PATCH 07/13] Start building against Spring Data Bom 2023.0.9 snapshots See gh-39460 --- 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 371562aba1..3be6f693ec 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1406,7 +1406,7 @@ bom { ] } } - library("Spring Data Bom", "2023.0.8") { + library("Spring Data Bom", "2023.0.9-SNAPSHOT") { considerSnapshots() calendarName = "Spring Data Release" group("org.springframework.data") { From a200dfe15785fedc4375742601ed58106178d5f1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 8 Feb 2024 13:29:37 +0000 Subject: [PATCH 08/13] Start building against Spring Framework 6.0.17 snapshots See gh-39461 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4a739e43a3..7bf2056e2d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ junitJupiterVersion=5.9.3 kotlinVersion=1.8.22 mavenVersion=3.9.4 nativeBuildToolsVersion=0.9.28 -springFrameworkVersion=6.0.16 +springFrameworkVersion=6.0.17-SNAPSHOT tomcatVersion=10.1.18 kotlin.stdlib.default.dependency=false From af3ffb209ca6c67cc689f60743cf91328f1ab354 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 8 Feb 2024 13:29:41 +0000 Subject: [PATCH 09/13] Start building against Spring GraphQL 1.2.5 snapshots See gh-39462 Co-authored-by: Brian Clozel --- ...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 e99c778746..a1e03f3f73 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,12 +43,10 @@ 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.function.RouterFunction; 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; @@ -84,8 +82,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")); @@ -116,8 +113,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")); }); @@ -148,12 +144,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 3be6f693ec..9335242a32 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1424,7 +1424,7 @@ bom { ] } } - library("Spring GraphQL", "1.2.4") { + library("Spring GraphQL", "1.2.5-SNAPSHOT") { considerSnapshots() group("org.springframework.graphql") { modules = [ From 420789fc63b7739eaa8cbb4360428745018d54d2 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 8 Feb 2024 13:29:46 +0000 Subject: [PATCH 10/13] Start building against Spring Integration 6.1.6 snapshots See gh-39463 --- 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 9335242a32..5790f76cf5 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1441,7 +1441,7 @@ bom { ] } } - library("Spring Integration", "6.1.5") { + library("Spring Integration", "6.1.6-SNAPSHOT") { considerSnapshots() group("org.springframework.integration") { imports = [ From 5671a4e8c5221bc3c168aef93682b4140ceec07b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 8 Feb 2024 13:29:50 +0000 Subject: [PATCH 11/13] Start building against Spring Kafka 3.0.14 snapshots See gh-39464 --- 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 5790f76cf5..a40e0485cc 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1449,7 +1449,7 @@ bom { ] } } - library("Spring Kafka", "3.0.13") { + library("Spring Kafka", "3.0.14-SNAPSHOT") { considerSnapshots() group("org.springframework.kafka") { modules = [ From 097ff791d68ce4d4e9a05dd09e9915aec318e772 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 8 Feb 2024 13:29:55 +0000 Subject: [PATCH 12/13] Start building against Spring LDAP 3.1.4 snapshots See gh-39465 --- 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 a40e0485cc..5ee0247241 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1458,7 +1458,7 @@ bom { ] } } - library("Spring LDAP", "3.1.3") { + library("Spring LDAP", "3.1.4-SNAPSHOT") { considerSnapshots() group("org.springframework.ldap") { modules = [ From e584ed3c6870d15cc4c0446fc2227be37600c6a6 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 8 Feb 2024 13:30:00 +0000 Subject: [PATCH 13/13] Start building against Spring Security 6.1.7 snapshots See gh-39466 --- 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 5ee0247241..3b8a332102 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1485,7 +1485,7 @@ bom { ] } } - library("Spring Security", "6.1.6") { + library("Spring Security", "6.1.7-SNAPSHOT") { considerSnapshots() group("org.springframework.security") { imports = [