[pull] main from spring-projects:main

buildSrc/src/main/java/org/springframework/boot/build/architecture/ArchitectureCheck.java

@@ -141,17 +141,18 @@ private Stream<EvaluationResult> evaluate(JavaClasses javaClasses) {
 
 	private void withCompileClasspath(Callable<?> callable) throws Exception {
 		ClassLoader previous = Thread.currentThread().getContextClassLoader();
-		try {
-			List<URL> urls = new ArrayList<>();
-			for (File file : getCompileClasspath().getFiles()) {
-				urls.add(file.toURI().toURL());
-			}
-			ClassLoader classLoader = new URLClassLoader(urls.toArray(new URL[0]), getClass().getClassLoader());
-			Thread.currentThread().setContextClassLoader(classLoader);
-			callable.call();
+		List<URL> urls = new ArrayList<>();
+		for (File file : getCompileClasspath().getFiles()) {
+			urls.add(file.toURI().toURL());
 		}
-		finally {
-			Thread.currentThread().setContextClassLoader(previous);
+		try (URLClassLoader classLoader = new URLClassLoader(urls.toArray(new URL[0]), getClass().getClassLoader())) {
+			Thread.currentThread().setContextClassLoader(classLoader);
+			try {
+				callable.call();
+			}
+			finally {
+				Thread.currentThread().setContextClassLoader(previous);
+			}
 		}
 	}
 

core/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -54,7 +54,7 @@
         "messages"
       ]
     },
-     {
+    {
       "name": "spring.resources.add-mappings",
       "type": "java.lang.Boolean",
       "deprecation": {

core/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -807,7 +807,7 @@
         }
       ]
     },
- 	{
+    {
       "name": "logging.structured.json.stacktrace.printer",
       "values": [
         {

module/spring-boot-activemq/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -95,4 +95,4 @@
       "defaultValue": true
     }
   ]
-}
+}

module/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -201,7 +201,7 @@
     },
     {
       "name": "management.wavefront.api-token-type",
-      "type": "org.springframework.boot.actuate.autoconfigure.wavefront.WavefrontProperties$TokenType",
+      "type": "java.lang.String",
       "deprecation": {
         "level": "error",
         "reason": "Wavefront is end-of-life.",

module/spring-boot-amqp/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -66,4 +66,4 @@
       }
     }
   ]
-}
+}

module/spring-boot-batch-jdbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -38,4 +38,4 @@
       }
     }
   ]
-}
+}

module/spring-boot-batch/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -7,4 +7,4 @@
       "defaultValue": true
     }
   ]
-}
+}

module/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/CassandraProperties.java

@@ -24,6 +24,7 @@
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.core.io.Resource;
+import org.springframework.util.StringUtils;
 
 /**
  * Configuration properties for Cassandra.
@@ -237,7 +238,7 @@ public static class Ssl {
 		private @Nullable String bundle;
 
 		public boolean isEnabled() {
-			return (this.enabled != null) ? this.enabled : this.bundle != null;
+			return (this.enabled != null) ? this.enabled : StringUtils.hasText(this.bundle);
 		}
 
 		public void setEnabled(boolean enabled) {

module/spring-boot-cassandra/src/test/java/org/springframework/boot/cassandra/autoconfigure/CassandraPropertiesTests.java

@@ -58,4 +58,11 @@ void defaultValuesInManualMetadataAreConsistent() {
 		assertThat(driverDefaults.get(TypedDriverOption.HEARTBEAT_TIMEOUT)).isEqualTo(Duration.ofSeconds(5));
 	}
 
+	@Test
+	void sslIsNotEnabledWhenBundleIsEmpty() {
+		CassandraProperties properties = new CassandraProperties();
+		properties.getSsl().setBundle("");
+		assertThat(properties.getSsl().isEnabled()).isFalse();
+	}
+
 }

module/spring-boot-data-mongodb/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -1,6 +1,6 @@
 {
   "properties": [
-  	{
+    {
       "name": "management.health.mongo.enabled",
       "deprecation": {
         "level": "error",
@@ -43,4 +43,4 @@
       ]
     }
   ]
-}
+}

module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisProperties.java

@@ -22,6 +22,7 @@
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.util.StringUtils;
 
 /**
  * Configuration properties for Redis.
@@ -463,7 +464,7 @@ public static class Ssl {
 		private @Nullable String bundle;
 
 		public boolean isEnabled() {
-			return (this.enabled != null) ? this.enabled : this.bundle != null;
+			return (this.enabled != null) ? this.enabled : StringUtils.hasText(this.bundle);
 		}
 
 		public void setEnabled(boolean enabled) {

module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisPropertiesTests.java → module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/DataRedisPropertiesTests.java

@@ -28,7 +28,7 @@
  *
  * @author Stephane Nicoll
  */
-class RedisPropertiesTests {
+class DataRedisPropertiesTests {
 
 	@Test
 	void lettuceDefaultsAreConsistent() {
@@ -39,4 +39,11 @@ void lettuceDefaultsAreConsistent() {
 			.isEqualTo(defaultClusterTopologyRefreshOptions.useDynamicRefreshSources());
 	}
 
+	@Test
+	void sslIsNotEnabledWhenBundleIsEmpty() {
+		DataRedisProperties properties = new DataRedisProperties();
+		properties.getSsl().setBundle("");
+		assertThat(properties.getSsl().isEnabled()).isFalse();
+	}
+
 }

module/spring-boot-elasticsearch/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -114,4 +114,4 @@
       }
     }
   ]
-}
+}

module/spring-boot-flyway/src/main/resources/META-INF/spring/additional-spring-configuration-metadata.json

@@ -210,4 +210,4 @@
       }
     }
   ]
-}
+}

module/spring-boot-graphql/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -66,8 +66,8 @@
     }
   ],
   "hints": [
-  {
-    "name": "spring.graphql.cors.allowed-headers",
+    {
+      "name": "spring.graphql.cors.allowed-headers",
       "values": [
         {
           "value": "*"

module/spring-boot-grpc-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -31,6 +31,5 @@
       "description": "Whether to enable CSRF protection.",
       "defaultValue": false
     }
-
   ]
 }

module/spring-boot-http-codec/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -1,4 +1,4 @@
-{ 
+{
   "properties": [
     {
       "name": "spring.http.codecs.preferred-json-mapper",

module/spring-boot-jdbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -50,7 +50,7 @@
     },
     {
       "name": "spring.datasource.initialization-mode",
-      "type": "org.springframework.boot.jdbc.DataSourceInitializationMode",
+      "type": "org.springframework.boot.sql.init.DatabaseInitializationMode",
       "deprecation": {
         "level": "error",
         "replacement": "spring.sql.init.mode",
@@ -210,4 +210,4 @@
       }
     ]
   }
-}
+}

module/spring-boot-jpa/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -6,6 +6,5 @@
       "defaultValue": true
     }
   ],
-  "hints": [
-  ]
+  "hints": []
 }

module/spring-boot-kafka/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -1,6 +1,6 @@
 {
   "properties": [
-     {
+    {
       "name": "spring.kafka.admin.ssl.keystore-location",
       "type": "org.springframework.core.io.Resource",
       "description": "Location of the key store file.",
@@ -303,4 +303,4 @@
       ]
     }
   ]
-}
+}

module/spring-boot-ldap/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -7,4 +7,4 @@
       "defaultValue": true
     }
   ]
-}
+}

module/spring-boot-liquibase/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -45,4 +45,4 @@
       ]
     }
   ]
-}
+}

module/spring-boot-mail/src/main/java/org/springframework/boot/mail/autoconfigure/MailSenderPropertiesConfiguration.java

@@ -73,7 +73,7 @@ private void applyProperties(MailProperties properties, JavaMailSenderImpl sende
 		if (ssl.isEnabled()) {
 			javaMailProperties.setProperty("mail." + protocol + ".ssl.enable", "true");
 		}
-		if (ssl.getBundle() != null) {
+		if (StringUtils.hasLength(ssl.getBundle())) {
 			Assert.state(sslBundles != null, "'sslBundles' must not be null");
 			SslBundle sslBundle = sslBundles.getBundle(ssl.getBundle());
 			javaMailProperties.put("mail." + protocol + ".ssl.socketFactory",

module/spring-boot-mail/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -10,9 +10,9 @@
     {
       "name": "spring.mail.test-connection",
       "description": "Whether to test that the mail server is available on startup.",
-      "sourceType": "org.springframework.boot.autoconfigure.mail.MailProperties",
+      "sourceType": "org.springframework.boot.mail.autoconfigure.MailSenderValidatorAutoConfiguration",
       "type": "java.lang.Boolean",
       "defaultValue": false
     }
   ]
-}
+}

module/spring-boot-mail/src/test/java/org/springframework/boot/mail/autoconfigure/MailSenderAutoConfigurationTests.java

@@ -245,6 +245,21 @@ void connectionOnStartupNotCalled() {
 			});
 	}
 
+	@Test
+	@WithPackageResources("test.jks")
+	void sslIsNotEnabledWhenBundleIsEmpty() {
+		this.contextRunner
+			.withPropertyValues("spring.mail.host:localhost", "spring.mail.ssl.bundle: ",
+					"spring.ssl.bundle.jks.test-bundle.keystore.location:classpath:test.jks",
+					"spring.ssl.bundle.jks.test-bundle.keystore.password:secret",
+					"spring.ssl.bundle.jks.test-bundle.key.password:password")
+			.run((context) -> {
+				assertThat(context).hasSingleBean(JavaMailSenderImpl.class);
+				JavaMailSenderImpl mailSender = context.getBean(JavaMailSenderImpl.class);
+				assertThat(mailSender.getJavaMailProperties().get("mail.smtp.ssl.socketFactory")).isNull();
+			});
+	}
+
 	@Test
 	void smtpSslEnabled() {
 		this.contextRunner.withPropertyValues("spring.mail.host:localhost", "spring.mail.ssl.enabled:true")

module/spring-boot-micrometer-metrics/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -62,7 +62,7 @@
         "since": "2.1.0"
       }
     },
-        {
+    {
       "name": "management.metrics.export.appoptics.api-token",
       "type": "java.lang.String",
       "deprecation": {
@@ -1393,7 +1393,7 @@
     },
     {
       "name": "management.metrics.export.prometheus.pushgateway.shutdown-operation",
-      "type": "org.springframework.boot.actuate.metrics.export.prometheus.PrometheusPushGatewayManager$ShutdownOperation",
+      "type": "org.springframework.boot.micrometer.metrics.export.prometheus.PrometheusPushGatewayManager$ShutdownOperation",
       "deprecation": {
         "level": "error",
         "replacement": "management.prometheus.metrics.export.pushgateway.shutdown-operation",
@@ -1756,7 +1756,7 @@
         "since": "3.0.0"
       }
     },
-        {
+    {
       "name": "management.metrics.web.server.auto-time-requests",
       "type": "java.lang.Boolean",
       "deprecation": {

module/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/autoconfigure/MongoProperties.java

@@ -23,6 +23,7 @@
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.util.StringUtils;
 
 /**
  * Configuration properties for Mongo.
@@ -238,7 +239,7 @@ public static class Ssl {
 		private @Nullable String bundle;
 
 		public boolean isEnabled() {
-			return (this.enabled != null) ? this.enabled : this.bundle != null;
+			return (this.enabled != null) ? this.enabled : StringUtils.hasText(this.bundle);
 		}
 
 		public void setEnabled(boolean enabled) {

module/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/autoconfigure/MongoPropertiesTests.java

@@ -49,6 +49,13 @@ void canBindCharArrayPassword() {
 			});
 	}
 
+	@Test
+	void sslIsNotEnabledWhenBundleIsEmpty() {
+		MongoProperties properties = new MongoProperties();
+		properties.getSsl().setBundle("");
+		assertThat(properties.getSsl().isEnabled()).isFalse();
+	}
+
 	private UuidRepresentation springDataDefaultUuidRepresentation() {
 		return new MongoConfigurationSupport() {