Merge branch '3.2.x'

Closes spring-projectsgh-40118

buildSrc/src/main/java/org/springframework/boot/build/bom/Library.java

@@ -246,7 +246,7 @@ public String forAntora() {
 		}
 
 		private String[] parts() {
-			return toString().split("[\\.-]");
+			return toString().split("[.-]");
 		}
 
 	}

spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/DefaultSourceDirectoryUrlFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ public class DefaultSourceDirectoryUrlFilter implements SourceDirectoryUrlFilter
 
 	private static final String[] COMMON_ENDINGS = { "/target/classes", "/bin" };
 
-	private static final Pattern URL_MODULE_PATTERN = Pattern.compile(".*\\/(.+)\\.jar");
+	private static final Pattern URL_MODULE_PATTERN = Pattern.compile(".*/(.+)\\.jar");
 
 	private static final Pattern VERSION_PATTERN = Pattern.compile("^-\\d+(?:\\.\\d+)*(?:[.-].+)?$");
 

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/pulsar/PulsarDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -39,8 +39,8 @@ class PulsarDockerComposeConnectionDetailsFactoryIntegrationTests extends Abstra
 	void runCreatesConnectionDetails() {
 		PulsarConnectionDetails connectionDetails = run(PulsarConnectionDetails.class);
 		assertThat(connectionDetails).isNotNull();
-		assertThat(connectionDetails.getBrokerUrl()).matches("^pulsar:\\/\\/\\S+:\\d+");
-		assertThat(connectionDetails.getAdminUrl()).matches("^http:\\/\\/\\S+:\\d+");
+		assertThat(connectionDetails.getBrokerUrl()).matches("^pulsar://\\S+:\\d+");
+		assertThat(connectionDetails.getAdminUrl()).matches("^http://\\S+:\\d+");
 	}
 
 }

spring-boot-project/spring-boot-docs/build.gradle

@@ -300,7 +300,7 @@ def antoraRootAggregateContent = tasks.register("antoraRootAggregateContent", Zi
 				.relativize(it.file.toPath())
 				.toString()
 				.replace('\\', '/')
-				.replaceAll('.*\\/([^\\/]+)\\/build.*', 'modules/ROOT/partials/$1/spring-configuration-metadata.json')
+				.replaceAll('.*/([^/]+)/build.*', 'modules/ROOT/partials/$1/spring-configuration-metadata.json')
 		}
 	}
 	from(runRemoteSpringApplicationExample) {

spring-boot-project/spring-boot-starters/spring-boot-starter-pulsar-reactive/build.gradle

@@ -11,6 +11,6 @@ dependencies {
 
 checkRuntimeClasspathForConflicts {
 	ignore { name -> name.startsWith("org/bouncycastle/") ||
-			name.matches("^org\\/apache\\/pulsar\\/.*\\/package-info.class\$") ||
+			name.matches("^org/apache/pulsar/.*/package-info.class\$") ||
 			name.equals("findbugsExclude.xml") }
 }

spring-boot-project/spring-boot-starters/spring-boot-starter-pulsar/build.gradle

@@ -11,6 +11,6 @@ dependencies {
 
 checkRuntimeClasspathForConflicts {
 	ignore { name -> name.startsWith("org/bouncycastle/") ||
-				name.matches("^org\\/apache\\/pulsar\\/.*\\/package-info.class\$") ||
+				name.matches("^org/apache/pulsar/.*/package-info.class\$") ||
 				name.equals("findbugsExclude.xml") }
 }

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImageReference.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@
  */
 public final class ImageReference {
 
-	private static final Pattern JAR_VERSION_PATTERN = Pattern.compile("^(.*)(\\-\\d+)$");
+	private static final Pattern JAR_VERSION_PATTERN = Pattern.compile("^(.*)(-\\d+)$");
 
 	private static final String LATEST = "latest";
 

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -195,7 +195,7 @@ void runtimeClasspathIncludesDevelopmentOnlyDependencies() {
 	@TestTemplate
 	void productionRuntimeClasspathIsConfiguredWithAttributesThatMatchRuntimeClasspath() {
 		String output = this.gradleBuild.build("build").getOutput();
-		Matcher matcher = Pattern.compile("runtimeClasspath: (\\[.*\\])").matcher(output);
+		Matcher matcher = Pattern.compile("runtimeClasspath: (\\[.*])").matcher(output);
 		assertThat(matcher.find()).as("%s found in %s", matcher, output).isTrue();
 		String attributes = matcher.group(1);
 		assertThat(output).contains("productionRuntimeClasspath: " + attributes);

spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuildExtension.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@
  */
 public class GradleBuildExtension implements BeforeEachCallback, AfterEachCallback {
 
-	private static final Pattern GRADLE_VERSION_PATTERN = Pattern.compile("\\[Gradle .+\\]");
+	private static final Pattern GRADLE_VERSION_PATTERN = Pattern.compile("\\[Gradle .+]");
 
 	private final Dsl dsl = Dsl.GROOVY;
 

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/DefaultLaunchScript.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ public class DefaultLaunchScript implements LaunchScript {
 
 	private static final int BUFFER_SIZE = 4096;
 
-	private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("\\{\\{(\\w+)(:.*?)?\\}\\}(?!\\})");
+	private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("\\{\\{(\\w+)(:.*?)?}}(?!})");
 
 	private static final Set<String> FILE_PATH_KEYS = Collections.singleton("inlinedConfScript");
 

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/TestJarFile.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -90,7 +90,7 @@ public void addManifest(Manifest manifest) throws IOException {
 	}
 
 	private File getFilePath(String filename) {
-		String[] paths = filename.split("\\/");
+		String[] paths = filename.split("/");
 		File file = this.jarSource;
 		for (String path : paths) {
 			file = new File(file, path);

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataLocationResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@ public class StandardConfigDataLocationResolver
 
 	private static final Pattern URL_PREFIX = Pattern.compile("^([a-zA-Z][a-zA-Z0-9*]*?:)(.*$)");
 
-	private static final Pattern EXTENSION_HINT_PATTERN = Pattern.compile("^(.*)\\[(\\.\\w+)\\](?!\\[)$");
+	private static final Pattern EXTENSION_HINT_PATTERN = Pattern.compile("^(.*)\\[(\\.\\w+)](?!\\[)$");
 
 	private static final String NO_PROFILE = null;
 

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java

@@ -588,7 +588,7 @@ void testDateformatPatternDefault(CapturedOutput output) {
 		initialize(loggingInitializationContext, null, null);
 		this.logger.info("Hello world");
 		assertThat(getLineWithText(output, "Hello world"))
-			.containsPattern("\\d{4}-\\d{2}\\-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}([-+]\\d{2}:\\d{2}|Z)");
+			.containsPattern("\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}([-+]\\d{2}:\\d{2}|Z)");
 	}
 
 	@Test

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/MimeMappingsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -152,7 +152,7 @@ void makeUnmodifiable() {
 	@Test
 	void mimeTypesInDefaultMappingsAreCorrectlyStructured() {
 		String regName = "[A-Za-z0-9!#$&.+\\-^_]{1,127}";
-		Pattern pattern = Pattern.compile("^" + regName + "\\/" + regName + "$");
+		Pattern pattern = Pattern.compile("^" + regName + "/" + regName + "$");
 		assertThat(MimeMappings.DEFAULT).allSatisfy((mapping) -> assertThat(mapping.getMimeType()).matches(pattern));
 	}