Merge branch '2.4.x'

Closes gh-25618

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeBom.java

@@ -66,7 +66,7 @@ public class UpgradeBom extends DefaultTask {
 		getProject().getRepositories().withType(MavenArtifactRepository.class, (repository) -> {
 			String repositoryUrl = repository.getUrl().toString();
 			if (!repositoryUrl.endsWith("snapshot")) {
-				this.repositoryUrls.add(repository.getUrl().toString());
+				this.repositoryUrls.add(repositoryUrl);
 			}
 		});
 	}

buildSrc/src/main/java/org/springframework/boot/build/toolchain/ToolchainPlugin.java

@@ -62,7 +62,7 @@ public class ToolchainPlugin implements Plugin<Project> {
 		}
 	}
 
-	public boolean isJavaVersionSupported(ToolchainExtension toolchain, JavaLanguageVersion toolchainVersion) {
+	private boolean isJavaVersionSupported(ToolchainExtension toolchain, JavaLanguageVersion toolchainVersion) {
 		return toolchain.getMaximumCompatibleJavaVersion().map((version) -> version.canCompileOrRun(toolchainVersion))
 				.getOrElse(true);
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointIntegrationTests.java

@@ -27,9 +27,7 @@ import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAu
 import org.springframework.boot.actuate.autoconfigure.web.jersey.JerseySameManagementContextConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.jersey.JerseyAutoConfiguration;
-import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener;
 import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration;
-import org.springframework.boot.logging.LogLevel;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
 import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
@@ -55,7 +53,6 @@ class JerseyWebEndpointIntegrationTests {
 						JerseyWebEndpointManagementContextConfiguration.class))
 				.withUserConfiguration(ResourceConfigConfiguration.class)
 				.withClassLoader(new FilteredClassLoader(DispatcherServlet.class))
-				.withInitializer(new ConditionEvaluationReportLoggingListener(LogLevel.INFO))
 				.withPropertyValues("spring.jersey.type=filter", "server.port=0").run((context) -> {
 					assertThat(context).hasNotFailed();
 					Set<Resource> resources = context.getBean(ResourceConfig.class).getResources();

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java

@@ -55,13 +55,11 @@ import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.XADataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
-import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfigurationTests.JpaUsingApplicationListenerConfiguration.EventCapturingApplicationListener;
 import org.springframework.boot.autoconfigure.orm.jpa.mapping.NonAnnotatedEntity;
 import org.springframework.boot.autoconfigure.orm.jpa.test.City;
 import org.springframework.boot.autoconfigure.transaction.jta.JtaAutoConfiguration;
 import org.springframework.boot.jdbc.init.DependsOnDataSourceInitialization;
-import org.springframework.boot.logging.LogLevel;
 import org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy;
 import org.springframework.boot.orm.jpa.hibernate.SpringJtaPlatform;
 import org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy;
@@ -356,8 +354,7 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes
 
 	@Test
 	void eventListenerCanBeRegisteredAsBeans() {
-		contextRunner().withInitializer(new ConditionEvaluationReportLoggingListener(LogLevel.INFO))
-				.withUserConfiguration(TestInitializedJpaConfiguration.class)
+		contextRunner().withUserConfiguration(TestInitializedJpaConfiguration.class)
 				.withClassLoader(new HideDataScriptClassLoader())
 				.withPropertyValues("spring.jpa.show-sql=true", "spring.jpa.hibernate.ddl-auto:create-drop",
 						"spring.datasource.data:classpath:/city.sql", "spring.jpa.defer-datasource-initialization=true")

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfigurationTests.java

@@ -19,8 +19,6 @@ package org.springframework.boot.autoconfigure.rsocket;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener;
-import org.springframework.boot.logging.LogLevel;
 import org.springframework.boot.rsocket.context.RSocketPortInfoApplicationContextInitializer;
 import org.springframework.boot.rsocket.context.RSocketServerBootstrap;
 import org.springframework.boot.rsocket.server.RSocketServerCustomizer;
@@ -148,7 +146,6 @@ class RSocketServerAutoConfigurationTests {
 	@Test
 	void whenSpringWebIsNotPresentThenEmbeddedServerConfigurationBacksOff() {
 		contextRunner().withClassLoader(new FilteredClassLoader(ReactorResourceFactory.class))
-				.withInitializer(new ConditionEvaluationReportLoggingListener(LogLevel.INFO))
 				.withPropertyValues("spring.rsocket.server.port=0")
 				.run((context) -> assertThat(context).doesNotHaveBean(RSocketServerFactory.class));
 	}

spring-boot-tests/spring-boot-deployment-tests/src/intTest/java/sample/TomEEDeploymentIntegrationTests.java

@@ -25,7 +25,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
  * @author Christoph Dreis
  */
 @Testcontainers(disabledWithoutDocker = true)
-public class TomEEDeploymentIntegrationTests extends AbstractDeploymentIntegrationTests {
+class TomEEDeploymentIntegrationTests extends AbstractDeploymentIntegrationTests {
 
 	@Container
 	static WarDeploymentContainer container = new WarDeploymentContainer("tomee:8-jre-8.0.2-webprofile",

spring-boot-tests/spring-boot-deployment-tests/src/intTest/java/sample/TomcatDeploymentIntegrationTests.java

@@ -25,7 +25,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
  * @author Christoph Dreis
  */
 @Testcontainers(disabledWithoutDocker = true)
-public class TomcatDeploymentIntegrationTests extends AbstractDeploymentIntegrationTests {
+class TomcatDeploymentIntegrationTests extends AbstractDeploymentIntegrationTests {
 
 	@Container
 	static WarDeploymentContainer container = new WarDeploymentContainer("tomcat:9.0.37-jdk8-openjdk",

spring-boot-tests/spring-boot-deployment-tests/src/intTest/java/sample/WildflyDeploymentIntegrationTests.java

@@ -25,7 +25,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
  * @author Christoph Dreis
  */
 @Testcontainers(disabledWithoutDocker = true)
-public class WildflyDeploymentIntegrationTests extends AbstractDeploymentIntegrationTests {
+class WildflyDeploymentIntegrationTests extends AbstractDeploymentIntegrationTests {
 
 	@Container
 	static WarDeploymentContainer container = new WarDeploymentContainer("jboss/wildfly:20.0.1.Final",