From 31fada6d3ea7483d54f5a8f18df466d4bc822450 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <andy.wilkinson@broadcom.com>
Date: Wed, 9 Oct 2024 11:01:09 +0100
Subject: [PATCH] Start building against Spring Framework 6.2.0 snapshots

See gh-42562
---
 gradle.properties                                               | 2 +-
 .../nestedtests/InheritedNestedTestConfigurationTests.java      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 6b87ac828c..b63c44c976 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@ mavenVersion=3.9.4
 mockitoVersion=5.13.0
 nativeBuildToolsVersion=0.10.3
 snakeYamlVersion=2.3
-springFrameworkVersion=6.2.0-RC1
+springFrameworkVersion=6.2.0-SNAPSHOT
 springFramework60xVersion=6.0.23
 tomcatVersion=10.1.30
 
diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/nestedtests/InheritedNestedTestConfigurationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/nestedtests/InheritedNestedTestConfigurationTests.java
index 1cc5c44492..51d6077f52 100644
--- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/nestedtests/InheritedNestedTestConfigurationTests.java
+++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/nestedtests/InheritedNestedTestConfigurationTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.boot.test.context.nestedtests;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
@@ -39,6 +40,7 @@ import static org.mockito.Mockito.times;
  */
 @SpringBootTest(classes = AppConfiguration.class)
 @Import(ActionPerformer.class)
+@Disabled("https://github.com/spring-projects/spring-framework/issues/33676")
 class InheritedNestedTestConfigurationTests {
 
 	@MockitoBean