diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyProperties.java
index f0f9f20c9d9..5b31dd9961d 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyProperties.java
@@ -73,6 +73,9 @@ public class Saml2RelyingPartyProperties {
 		 */
 		private final AssertingParty assertingparty = new AssertingParty();
 
+		/**
+		 * Name ID format for a relying party registration.
+		 */
 		private String nameIdFormat;
 
 		public String getEntityId() {
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebHttpHandlerBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebHttpHandlerBuilderCustomizer.java
index fcc755d8b18..b416e066c7c 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebHttpHandlerBuilderCustomizer.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebHttpHandlerBuilderCustomizer.java
@@ -29,7 +29,7 @@ public interface WebHttpHandlerBuilderCustomizer {
 
 	/**
 	 * Callback to customize a {@link WebHttpHandlerBuilder} instance.
-	 * @param webHttpHandlerBuilder the handlerBuilder to customize
+	 * @param webHttpHandlerBuilder the {@link WebHttpHandlerBuilder} to customize
 	 */
 	void customize(WebHttpHandlerBuilder webHttpHandlerBuilder);
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java
index 6e8e604b545..bf8bad0de84 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java
@@ -84,10 +84,6 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.jdbc.datasource.init.DatabasePopulator;
 import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionException;
-import org.springframework.transaction.support.AbstractPlatformTransactionManager;
-import org.springframework.transaction.support.DefaultTransactionStatus;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -517,61 +513,40 @@ class BatchAutoConfigurationTests {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	protected static class BatchDataSourceConfiguration {
+	static class BatchDataSourceConfiguration {
 
 		@Bean
 		@Primary
-		public DataSource normalDataSource() {
+		DataSource normalDataSource() {
 			return DataSourceBuilder.create().url("jdbc:hsqldb:mem:normal").username("sa").build();
 		}
 
 		@BatchDataSource
 		@Bean
-		public DataSource batchDataSource() {
+		DataSource batchDataSource() {
 			return DataSourceBuilder.create().url("jdbc:hsqldb:mem:batchdatasource").username("sa").build();
 		}
 
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	protected static class BatchTransactionManagerConfiguration {
+	static class BatchTransactionManagerConfiguration {
 
 		@Bean
-		public DataSource dataSource() {
+		DataSource dataSource() {
 			return DataSourceBuilder.create().url("jdbc:hsqldb:mem:database").username("sa").build();
 		}
 
 		@Bean
 		@Primary
-		public PlatformTransactionManager normalTransactionManager() {
-			return new TestTransactionManager();
+		PlatformTransactionManager normalTransactionManager() {
+			return mock(PlatformTransactionManager.class);
 		}
 
 		@BatchTransactionManager
 		@Bean
-		public PlatformTransactionManager batchTransactionManager() {
-			return new TestTransactionManager();
-		}
-
-	}
-
-	static class TestTransactionManager extends AbstractPlatformTransactionManager {
-
-		@Override
-		protected Object doGetTransaction() throws TransactionException {
-			return null;
-		}
-
-		@Override
-		protected void doBegin(Object transaction, TransactionDefinition definition) throws TransactionException {
-		}
-
-		@Override
-		protected void doCommit(DefaultTransactionStatus status) throws TransactionException {
-		}
-
-		@Override
-		protected void doRollback(DefaultTransactionStatus status) throws TransactionException {
+		PlatformTransactionManager batchTransactionManager() {
+			return mock(PlatformTransactionManager.class);
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
index 7c290335341..451c26cc599 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1455,7 +1455,7 @@ bom {
 	library("Pulsar", "3.2.2") {
 		group("org.apache.pulsar") {
 			imports = [
-					"pulsar-bom"
+				"pulsar-bom"
 			]
 		}
 		links {
diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/activemq/ActiveMQClassicDockerComposeConnectionDetailsFactory.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/activemq/ActiveMQClassicDockerComposeConnectionDetailsFactory.java
index 3442420bb62..fa3603d1d00 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/activemq/ActiveMQClassicDockerComposeConnectionDetailsFactory.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/activemq/ActiveMQClassicDockerComposeConnectionDetailsFactory.java
@@ -43,7 +43,7 @@ class ActiveMQClassicDockerComposeConnectionDetailsFactory
 	}
 
 	/**
-	 * {@link ActiveMQConnectionDetails} backed by a {@code activemq}
+	 * {@link ActiveMQConnectionDetails} backed by an {@code activemq}
 	 * {@link RunningService}.
 	 */
 	static class ActiveMQDockerComposeConnectionDetails extends DockerComposeConnectionDetails
diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/activemq/ActiveMQDockerComposeConnectionDetailsFactory.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/activemq/ActiveMQDockerComposeConnectionDetailsFactory.java
index 30597c45a8d..0a8c4214385 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/activemq/ActiveMQDockerComposeConnectionDetailsFactory.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/activemq/ActiveMQDockerComposeConnectionDetailsFactory.java
@@ -42,7 +42,7 @@ class ActiveMQDockerComposeConnectionDetailsFactory
 	}
 
 	/**
-	 * {@link ActiveMQConnectionDetails} backed by a {@code activemq}
+	 * {@link ActiveMQConnectionDetails} backed by an {@code activemq}
 	 * {@link RunningService}.
 	 */
 	static class ActiveMQDockerComposeConnectionDetails extends DockerComposeConnectionDetails