Merge branch '3.5.x' into 4.0.x

Closes gh-49818

Author: snicoll

buildpack/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ssl/PemCertificateParser.java

@@ -96,7 +96,7 @@ private static void readCertificates(String text, CertificateFactory factory, Co
 	}
 
 	private static byte[] decodeBase64(String content) {
-		byte[] bytes = content.replaceAll("\r", "").replaceAll("\n", "").getBytes();
+		byte[] bytes = content.replace("\r", "").replace("\n", "").getBytes();
 		return Base64.getDecoder().decode(bytes);
 	}
 

buildpack/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ssl/PemPrivateKeyParser.java

@@ -244,7 +244,7 @@ private static class PemParser {
 		}
 
 		private static byte[] decodeBase64(String content) {
-			byte[] contentBytes = content.replaceAll("\r", "").replaceAll("\n", "").getBytes();
+			byte[] contentBytes = content.replace("\r", "").replace("\n", "").getBytes();
 			return Base64.getDecoder().decode(contentBytes);
 		}
 

buildpack/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/LifecycleTests.java

@@ -482,7 +482,7 @@ private Answer<ContainerReference> answerWithGeneratedContainerId() {
 		return (invocation) -> {
 			ContainerConfig config = invocation.getArgument(0, ContainerConfig.class);
 			ArrayNode command = getCommand(config);
-			String name = command.get(0).asString().substring(1).replaceAll("/", "-");
+			String name = command.get(0).asString().substring(1).replace('/', '-');
 			this.configs.put(name, config);
 			if (invocation.getArguments().length > 2) {
 				this.content.put(name, invocation.getArgument(2, ContainerContent.class));

buildpack/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/ssl/PemFileWriter.java

@@ -181,7 +181,7 @@ public PemFileWriter() throws IOException {
 	Path writeFile(String name, String... contents) throws IOException {
 		Path path = Paths.get(this.tempDir.toString(), name);
 		for (String content : contents) {
-			Files.write(path, content.replaceAll(EXAMPLE_SECRET_QUALIFIER, "").getBytes(), StandardOpenOption.CREATE,
+			Files.write(path, content.replace(EXAMPLE_SECRET_QUALIFIER, "").getBytes(), StandardOpenOption.CREATE,
 					StandardOpenOption.APPEND);
 		}
 		return path;

core/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemCertificateParser.java

@@ -96,7 +96,7 @@ private static void readCertificates(String text, CertificateFactory factory, Co
 	}
 
 	private static byte[] decodeBase64(String content) {
-		byte[] bytes = content.replaceAll("\r", "").replaceAll("\n", "").getBytes();
+		byte[] bytes = content.replace("\r", "").replace("\n", "").getBytes();
 		return Base64.getDecoder().decode(bytes);
 	}
 

core/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemPrivateKeyParser.java

@@ -244,7 +244,7 @@ private static class PemParser {
 		}
 
 		private static byte[] decodeBase64(String content) {
-			byte[] contentBytes = content.replaceAll("\r", "").replaceAll("\n", "").getBytes();
+			byte[] contentBytes = content.replace("\r", "").replace("\n", "").getBytes();
 			return Base64.getDecoder().decode(contentBytes);
 		}