diff --git a/build-plugin/spring-boot-maven-plugin/src/intTest/projects/run-working-directory/src/main/java/org/test/SampleApplication.java b/build-plugin/spring-boot-maven-plugin/src/intTest/projects/run-working-directory/src/main/java/org/test/SampleApplication.java
index 86919ee5458..44a7457374f 100644
--- a/build-plugin/spring-boot-maven-plugin/src/intTest/projects/run-working-directory/src/main/java/org/test/SampleApplication.java
+++ b/build-plugin/spring-boot-maven-plugin/src/intTest/projects/run-working-directory/src/main/java/org/test/SampleApplication.java
@@ -19,7 +19,7 @@ package org.test;
 public class SampleApplication {
 
 	public static void main(String[] args) {
-		String workingDirectory =  System.getProperty("user.dir");
+		String workingDirectory = System.getProperty("user.dir");
 		System.out.println(String.format("I haz been run from %s", workingDirectory));
 	}
 
diff --git a/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/DataRepositoryMetricsAutoConfigurationIntegrationTests.java b/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/DataRepositoryMetricsAutoConfigurationIntegrationTests.java
index dc001325262..bea461fecfb 100644
--- a/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/DataRepositoryMetricsAutoConfigurationIntegrationTests.java
+++ b/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/DataRepositoryMetricsAutoConfigurationIntegrationTests.java
@@ -48,7 +48,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 		CREATE TABLE CITY (
 		  id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
 		  name VARCHAR(30),
-		  country  VARCHAR(30)
+		  country VARCHAR(30)
 		);
 		""")
 class DataRepositoryMetricsAutoConfigurationIntegrationTests {
diff --git a/module/spring-boot-data-jdbc/src/test/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-jdbc/src/test/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesAutoConfigurationTests.java
index 787a6be5838..193c8149d0f 100644
--- a/module/spring-boot-data-jdbc/src/test/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-jdbc/src/test/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesAutoConfigurationTests.java
@@ -67,9 +67,9 @@ import static org.mockito.Mockito.mock;
 		CREATE TABLE CITY (
 		  id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
 		  name VARCHAR(30),
-		  state  VARCHAR(30),
-		  country  VARCHAR(30),
-		  map  VARCHAR(30)
+		  state VARCHAR(30),
+		  country VARCHAR(30),
+		  map VARCHAR(30)
 		);
 		""")
 @WithResource(name = "data.sql",
diff --git a/module/spring-boot-data-r2dbc/src/test/java/org/springframework/boot/data/r2dbc/autoconfigure/DataR2dbcRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-r2dbc/src/test/java/org/springframework/boot/data/r2dbc/autoconfigure/DataR2dbcRepositoriesAutoConfigurationTests.java
index 7f01ce31b74..6dcf4648e9c 100644
--- a/module/spring-boot-data-r2dbc/src/test/java/org/springframework/boot/data/r2dbc/autoconfigure/DataR2dbcRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-r2dbc/src/test/java/org/springframework/boot/data/r2dbc/autoconfigure/DataR2dbcRepositoriesAutoConfigurationTests.java
@@ -53,9 +53,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 		CREATE TABLE CITY (
 		  id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
 		  name VARCHAR(30),
-		  state  VARCHAR(30),
-		  country  VARCHAR(30),
-		  map  VARCHAR(30)
+		  state VARCHAR(30),
+		  country VARCHAR(30),
+		  map VARCHAR(30)
 		);
 		""")
 @WithResource(name = "data.sql",
diff --git a/module/spring-boot-hazelcast/src/main/java/org/springframework/boot/hazelcast/autoconfigure/HazelcastClientConfigAvailableCondition.java b/module/spring-boot-hazelcast/src/main/java/org/springframework/boot/hazelcast/autoconfigure/HazelcastClientConfigAvailableCondition.java
index e64616991e2..cf3ec1041df 100644
--- a/module/spring-boot-hazelcast/src/main/java/org/springframework/boot/hazelcast/autoconfigure/HazelcastClientConfigAvailableCondition.java
+++ b/module/spring-boot-hazelcast/src/main/java/org/springframework/boot/hazelcast/autoconfigure/HazelcastClientConfigAvailableCondition.java
@@ -78,7 +78,7 @@ class HazelcastClientConfigAvailableCondition extends HazelcastConfigResourceCon
 		private static String existingConfigurationOutcome(Resource resource, boolean client) throws IOException {
 			URL location = resource.getURL();
 			return client ? "Hazelcast client configuration detected at '" + location + "'"
-					: "Hazelcast server configuration detected  at '" + location + "'";
+					: "Hazelcast server configuration detected at '" + location + "'";
 		}
 
 	}
diff --git a/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfigurationTests.java b/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfigurationTests.java
index 0808f489e02..e438b571f72 100644
--- a/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfigurationTests.java
+++ b/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfigurationTests.java
@@ -145,9 +145,9 @@ class HibernateMetricsAutoConfigurationTests {
 			CREATE TABLE CITY (
 			  id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
 			  name VARCHAR(30),
-			  state  VARCHAR(30),
-			  country  VARCHAR(30),
-			  map  VARCHAR(30)
+			  state VARCHAR(30),
+			  country VARCHAR(30),
+			  map VARCHAR(30)
 			);
 			""")
 	@WithResource(name = "city-data.sql",
diff --git a/module/spring-boot-security-saml2/src/main/java/org/springframework/boot/security/saml2/autoconfigure/Saml2RelyingPartyRegistrationConfiguration.java b/module/spring-boot-security-saml2/src/main/java/org/springframework/boot/security/saml2/autoconfigure/Saml2RelyingPartyRegistrationConfiguration.java
index 22e2e5a1655..be043af0982 100644
--- a/module/spring-boot-security-saml2/src/main/java/org/springframework/boot/security/saml2/autoconfigure/Saml2RelyingPartyRegistrationConfiguration.java
+++ b/module/spring-boot-security-saml2/src/main/java/org/springframework/boot/security/saml2/autoconfigure/Saml2RelyingPartyRegistrationConfiguration.java
@@ -194,7 +194,7 @@ class Saml2RelyingPartyRegistrationConfiguration {
 
 	private X509Certificate readCertificate(@Nullable Resource location) {
 		Assert.state(location != null, "No certificate location specified");
-		Assert.state(location.exists(), () -> "Certificate  location '" + location + "' does not exist");
+		Assert.state(location.exists(), () -> "Certificate location '" + location + "' does not exist");
 		try (InputStream inputStream = location.getInputStream()) {
 			PemContent pemContent = PemContent.load(inputStream);
 			List<X509Certificate> certificates = pemContent.getCertificates();