Start building against Spring Framework 7.1.0-M2 snapshots

See gh-51712

core/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebPropertiesResourcesTests.java

@@ -77,12 +77,20 @@ class WebPropertiesResourcesTests {
 		assertThat(cacheControl).isNull();
 	}
 
+	@Test
+	void cacheControlPublic() {
+		Cache.Cachecontrol properties = this.properties.getCache().getCachecontrol();
+		properties.setCachePublic(true);
+		CacheControl cacheControl = properties.toHttpCacheControl();
+		assertThat(cacheControl).isNotNull();
+		assertThat(cacheControl.getHeaderValue()).isEqualTo("public");
+	}
+
 	@Test
 	void cacheControlAllPropertiesSet() {
 		Cache.Cachecontrol properties = this.properties.getCache().getCachecontrol();
 		properties.setMaxAge(Duration.ofSeconds(4));
 		properties.setCachePrivate(true);
-		properties.setCachePublic(true);
 		properties.setMustRevalidate(true);
 		properties.setNoTransform(true);
 		properties.setProxyRevalidate(true);
@@ -92,7 +100,7 @@ class WebPropertiesResourcesTests {
 		CacheControl cacheControl = properties.toHttpCacheControl();
 		assertThat(cacheControl).isNotNull();
 		assertThat(cacheControl.getHeaderValue())
-			.isEqualTo("max-age=4, must-revalidate, no-transform, public, private, proxy-revalidate,"
+			.isEqualTo("max-age=4, must-revalidate, no-transform, private, proxy-revalidate,"
 					+ " s-maxage=5, stale-if-error=6, stale-while-revalidate=7");
 	}
 

gradle.properties

@@ -22,7 +22,7 @@ nativeBuildToolsVersion=1.1.12
 nullabilityPluginVersion=0.0.15
 snakeYamlVersion=2.7
 springGrpcVersion=1.1.1
-springFrameworkVersion=7.1.0-M1
+springFrameworkVersion=7.1.0-SNAPSHOT
 springFramework60xVersion=6.0.23
 tomcatVersion=11.0.25
 protobufGradlePluginVersion=0.9.6

module/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java

@@ -100,6 +100,7 @@ public enum EmbeddedDatabaseConnection {
 	 * Returns the {@link EmbeddedDatabaseType} for the connection.
 	 * @return the database type
 	 */
+	@SuppressWarnings("removal")
 	public @Nullable EmbeddedDatabaseType getType() {
 		// See https://github.com/spring-projects/spring-boot/issues/32865
 		return switch (this) {

module/spring-boot-jdbc/src/test/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnectionTests.java

@@ -111,6 +111,8 @@ class EmbeddedDatabaseConnectionTests {
 	}
 
 	@Test
+	@Deprecated(since = "4.2.0", forRemoval = true)
+	@SuppressWarnings("removal")
 	void isEmbeddedWithDerbyDataSource() {
 		testEmbeddedDatabase(new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.DERBY).build());
 	}