Merge branch '3.0.x'

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,3 @@
+# Failure Analyzers
 org.springframework.boot.diagnostics.FailureAnalyzer=\
 org.springframework.boot.actuate.autoconfigure.metrics.ValidationFailureAnalyzer

spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -1,4 +1,4 @@
-# Initializers
+# ApplicationContext Initializers
 org.springframework.context.ApplicationContextInitializer=\
 org.springframework.boot.autoconfigure.SharedMetadataReaderFactoryContextInitializer,\
 org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener
@@ -21,7 +21,7 @@ org.springframework.boot.autoconfigure.condition.OnBeanCondition,\
 org.springframework.boot.autoconfigure.condition.OnClassCondition,\
 org.springframework.boot.autoconfigure.condition.OnWebApplicationCondition
 
-# Failure analyzers
+# Failure Analyzers
 org.springframework.boot.diagnostics.FailureAnalyzer=\
 org.springframework.boot.autoconfigure.data.redis.RedisUrlSyntaxFailureAnalyzer,\
 org.springframework.boot.autoconfigure.diagnostics.analyzer.NoSuchBeanDefinitionFailureAnalyzer,\
@@ -34,7 +34,7 @@ org.springframework.boot.autoconfigure.r2dbc.MissingR2dbcPoolDependencyFailureAn
 org.springframework.boot.autoconfigure.r2dbc.MultipleConnectionPoolConfigurationsFailureAnalyzer,\
 org.springframework.boot.autoconfigure.r2dbc.NoConnectionFactoryBeanFailureAnalyzer
 
-# Template availability providers
+# Template Availability Providers
 org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider=\
 org.springframework.boot.autoconfigure.freemarker.FreeMarkerTemplateAvailabilityProvider,\
 org.springframework.boot.autoconfigure.mustache.MustacheTemplateAvailabilityProvider,\
@@ -42,11 +42,11 @@ org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAvailabilit
 org.springframework.boot.autoconfigure.thymeleaf.ThymeleafTemplateAvailabilityProvider,\
 org.springframework.boot.autoconfigure.web.servlet.JspTemplateAvailabilityProvider
 
-# DataSource initializer detectors
+# DataSource Initializer Detectors
 org.springframework.boot.sql.init.dependency.DatabaseInitializerDetector=\
 org.springframework.boot.autoconfigure.flyway.FlywayMigrationInitializerDatabaseInitializerDetector
 
-# Depends on database initialization detectors
+# Depends on Database Initialization Detectors
 org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitializationDetector=\
 org.springframework.boot.autoconfigure.batch.JobRepositoryDependsOnDatabaseInitializationDetector,\
 org.springframework.boot.autoconfigure.quartz.SchedulerDependsOnDatabaseInitializationDetector,\

spring-boot-project/spring-boot-devtools/src/main/resources/META-INF/spring.factories

@@ -1,4 +1,4 @@
-# Application Initializers
+# ApplicationContext Initializers
 org.springframework.context.ApplicationContextInitializer=\
 org.springframework.boot.devtools.restart.RestartScopeInitializer
 

spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -1,4 +1,4 @@
-# Spring Test ContextCustomizerFactories
+# Spring Test Context Customizer Factories
 org.springframework.test.context.ContextCustomizerFactory=\
 org.springframework.boot.test.autoconfigure.OverrideAutoConfigurationContextCustomizerFactory,\
 org.springframework.boot.test.autoconfigure.actuate.observability.ObservabilityContextCustomizerFactory,\
@@ -7,7 +7,7 @@ org.springframework.boot.test.autoconfigure.properties.PropertyMappingContextCus
 org.springframework.boot.test.autoconfigure.service.connection.ServiceConnectionContextCustomizerFactory,\
 org.springframework.boot.test.autoconfigure.web.servlet.WebDriverContextCustomizerFactory
 
-# Test Execution Listeners
+# Spring Test Execution Listeners
 org.springframework.test.context.TestExecutionListener=\
 org.springframework.boot.test.autoconfigure.restdocs.RestDocsTestExecutionListener,\
 org.springframework.boot.test.autoconfigure.web.client.MockRestServiceServerResetTestExecutionListener,\
@@ -15,6 +15,7 @@ org.springframework.boot.test.autoconfigure.web.servlet.MockMvcPrintOnlyOnFailur
 org.springframework.boot.test.autoconfigure.web.servlet.WebDriverTestExecutionListener,\
 org.springframework.boot.test.autoconfigure.webservices.client.MockWebServiceServerTestExecutionListener
 
+# Spring Test ApplcationContext Failure Processors
 org.springframework.test.context.ApplicationContextFailureProcessor=\
 org.springframework.boot.test.autoconfigure.ConditionReportApplicationContextFailureProcessor
 

spring-boot-project/spring-boot-test/src/main/resources/META-INF/spring.factories

@@ -1,4 +1,4 @@
-# Spring Test ContextCustomizerFactories
+# Spring Test Context Customizer Factories
 org.springframework.test.context.ContextCustomizerFactory=\
 org.springframework.boot.test.context.ImportsContextCustomizerFactory,\
 org.springframework.boot.test.context.filter.ExcludeFilterContextCustomizerFactory,\

spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,3 @@
+# Jar Modes
 org.springframework.boot.loader.jarmode.JarMode=\
 org.springframework.boot.jarmode.layertools.LayerToolsJarMode

spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/resources/META-INF/spring.factories

@@ -1,2 +1,3 @@
+# Jar Modes
 org.springframework.boot.loader.jarmode.JarMode=\
 org.springframework.boot.loader.jarmode.TestJarMode

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-custom-layout/layout/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,3 @@
+# Layout Factories
 org.springframework.boot.loader.tools.LayoutFactory=\
 smoketest.layout.SampleLayoutFactory

spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,3 @@
+# Application Listeners
 org.springframework.context.ApplicationListener=\
 org.springframework.boot.context.properties.migrator.PropertiesMigrationListener

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-bootstrap-registry/src/main/resources/META-INF/spring.factories

@@ -1,5 +1,7 @@
+# ConfigData Location Resolvers
 org.springframework.boot.context.config.ConfigDataLocationResolver=\
 smoketest.bootstrapregistry.external.svn.SubversionConfigDataLocationResolver
 
+# ConfigData Loaders
 org.springframework.boot.context.config.ConfigDataLoader=\
 smoketest.bootstrapregistry.external.svn.SubversionConfigDataLoader

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,3 @@
+# Environment Post Processors
 org.springframework.boot.env.EnvironmentPostProcessor=\
 smoketest.profile.ActiveProfilesEnvironmentPostProcessor