Issue 39565

README.adoc

@@ -1,4 +1,4 @@
-= Spring Boot image:https://ci.spring.io/api/v1/teams/spring-boot/pipelines/spring-boot-3.1.x/jobs/build/badge["Build Status", link="https://ci.spring.io/teams/spring-boot/pipelines/spring-boot-3.1.x?groups=Build"] image:https://badges.gitter.im/Join Chat.svg["Chat",link="https://gitter.im/spring-projects/spring-boot?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"] image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?&search.rootProjectNames=Spring%20Boot%20Build&search.rootProjectNames=spring-boot-build"]
+= Spring Boot image:https://ci.spring.io/api/v1/teams/spring-boot/pipelines/spring-boot-3.3.x/jobs/build/badge["Build Status", link="https://ci.spring.io/teams/spring-boot/pipelines/spring-boot-3.3.x?groups=Build"] image:https://badges.gitter.im/Join Chat.svg["Chat",link="https://gitter.im/spring-projects/spring-boot?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"] image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?&search.rootProjectNames=Spring%20Boot%20Build&search.rootProjectNames=spring-boot-build"]
 :docs: https://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference
 :github: https://github.com/spring-projects/spring-boot
 

buildSrc/build.gradle

@@ -17,11 +17,12 @@ def versions = [:]
 new File(projectDir.parentFile, "gradle.properties").withInputStream {
 	def properties = new Properties()
 	properties.load(it)
-	["assertj", "commonsCodec", "hamcrest", "jackson", "junitJupiter",
-		"kotlin", "maven", "springFramework"].each {
+	["assertj", "commonsCodec", "hamcrest", "junitJupiter", "kotlin", "maven"].each {
 		versions[it] = properties[it + "Version"]
 	}
 }
+versions["jackson"] = "2.15.3"
+versions["springFramework"] = "6.0.12"
 ext.set("versions", versions)
 if (versions.springFramework.contains("-")) {
 	repositories {
@@ -136,4 +137,3 @@ eclipse.classpath.file.whenMerged {
 	jreEntry.entryAttributes['module'] = 'true'
 	jreEntry.entryAttributes['limit-modules'] = 'java.base'
 }
-

buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.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.
@@ -134,7 +134,7 @@ private void configureForkOptions(AbstractAsciidoctorTask asciidoctorTask) {
 
 	private String determineGitHubTag(Project project) {
 		String version = "v" + project.getVersion();
-		return (version.endsWith("-SNAPSHOT")) ? "3.1.x" : version;
+		return (version.endsWith("-SNAPSHOT")) ? "main" : version;
 	}
 
 	private void configureOptions(AbstractAsciidoctorTask asciidoctorTask) {

buildSrc/src/main/java/org/springframework/boot/build/bom/BomPlugin.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.
@@ -291,9 +291,7 @@ private boolean isNodeWithName(Object candidate, String name) {
 				if ((node.name() instanceof QName qname) && name.equals(qname.getLocalPart())) {
 					return true;
 				}
-				if (name.equals(node.name())) {
-					return true;
-				}
+				return name.equals(node.name());
 			}
 			return false;
 		}

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/StandardLibraryUpdateResolver.java

@@ -19,14 +19,12 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.function.BiPredicate;
-import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -113,19 +111,14 @@ private List<VersionOption> determineResolvedVersionOptions(Library library) {
 						getLaterVersionsForModule(group.getId(), plugin, library));
 			}
 		}
-		List<DependencyVersion> allVersions = moduleVersions.values()
+		return moduleVersions.values()
 			.stream()
 			.flatMap(SortedSet::stream)
 			.distinct()
 			.filter((dependencyVersion) -> this.predicate.test(library, dependencyVersion))
-			.toList();
-		if (allVersions.isEmpty()) {
-			return Collections.emptyList();
-		}
-		return allVersions.stream()
-			.map((version) -> new VersionOption.ResolvedVersionOption(version,
+			.map((version) -> (VersionOption) new VersionOption.ResolvedVersionOption(version,
 					getMissingModules(moduleVersions, version)))
-			.collect(Collectors.toList());
+			.toList();
 	}
 
 	private List<String> getMissingModules(Map<String, SortedSet<DependencyVersion>> moduleVersions,

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeDependencies.java

@@ -169,8 +169,9 @@ private List<String> verifyLabels(GitHubRepository repository) {
 		if (!availableLabels.containsAll(issueLabels)) {
 			List<String> unknownLabels = new ArrayList<>(issueLabels);
 			unknownLabels.removeAll(availableLabels);
+			String suffix = (unknownLabels.size() == 1) ? "" : "s";
 			throw new InvalidUserDataException(
-					"Unknown label(s): " + StringUtils.collectionToCommaDelimitedString(unknownLabels));
+					"Unknown label" + suffix + ": " + StringUtils.collectionToCommaDelimitedString(unknownLabels));
 		}
 		return issueLabels;
 	}
@@ -193,7 +194,7 @@ private Milestone determineMilestone(GitHubRepository repository) {
 		java.util.Optional<Milestone> matchingMilestone = milestones.stream()
 			.filter((milestone) -> milestone.getName().equals(getMilestone().get()))
 			.findFirst();
-		if (!matchingMilestone.isPresent()) {
+		if (matchingMilestone.isEmpty()) {
 			throw new InvalidUserDataException("Unknown milestone: " + getMilestone().get());
 		}
 		return matchingMilestone.get();
@@ -241,9 +242,9 @@ private boolean isAnUpgrade(Library library, DependencyVersion candidate) {
 	}
 
 	private boolean isNotProhibited(Library library, DependencyVersion candidate) {
-		return !library.getProhibitedVersions()
+		return library.getProhibitedVersions()
 			.stream()
-			.anyMatch((prohibited) -> prohibited.isProhibited(candidate.toString()));
+			.noneMatch((prohibited) -> prohibited.isProhibited(candidate.toString()));
 	}
 
 	private List<Library> matchingLibraries() {

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/version/AbstractDependencyVersion.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.
@@ -58,10 +58,7 @@ public boolean equals(Object obj) {
 			return false;
 		}
 		AbstractDependencyVersion other = (AbstractDependencyVersion) obj;
-		if (!this.comparableVersion.equals(other.comparableVersion)) {
-			return false;
-		}
-		return true;
+		return this.comparableVersion.equals(other.comparableVersion);
 	}
 
 	@Override

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/version/DependencyVersion.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.
@@ -48,7 +48,7 @@ public interface DependencyVersion extends Comparable<DependencyVersion> {
 	 * Returns whether the given {@code candidate} is an upgrade of this version.
 	 * @param candidate the version to consider
 	 * @param movingToSnapshots whether the upgrade is to be considered as part of moving
-	 * to snaphots
+	 * to snapshots
 	 * @return {@code true} if the candidate is an upgrade, otherwise false
 	 */
 	boolean isUpgrade(DependencyVersion candidate, boolean movingToSnapshots);

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/version/ReleaseTrainDependencyVersion.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.
@@ -64,22 +64,25 @@ public int compareTo(DependencyVersion other) {
 
 	@Override
 	public boolean isUpgrade(DependencyVersion candidate, boolean movingToSnapshots) {
-		if (!(candidate instanceof ReleaseTrainDependencyVersion)) {
-			return true;
+		if (candidate instanceof ReleaseTrainDependencyVersion candidateReleaseTrain) {
+			return isUpgrade(candidateReleaseTrain, movingToSnapshots);
 		}
-		ReleaseTrainDependencyVersion candidateReleaseTrain = (ReleaseTrainDependencyVersion) candidate;
-		int comparison = this.releaseTrain.compareTo(candidateReleaseTrain.releaseTrain);
+		return true;
+	}
+
+	private boolean isUpgrade(ReleaseTrainDependencyVersion candidate, boolean movingToSnapshots) {
+		int comparison = this.releaseTrain.compareTo(candidate.releaseTrain);
 		if (comparison != 0) {
 			return comparison < 0;
 		}
-		if (movingToSnapshots && !isSnapshot() && candidateReleaseTrain.isSnapshot()) {
+		if (movingToSnapshots && !isSnapshot() && candidate.isSnapshot()) {
 			return true;
 		}
-		comparison = this.type.compareTo(candidateReleaseTrain.type);
+		comparison = this.type.compareTo(candidate.type);
 		if (comparison != 0) {
 			return comparison < 0;
 		}
-		return Integer.compare(this.version, candidateReleaseTrain.version) < 0;
+		return Integer.compare(this.version, candidate.version) < 0;
 	}
 
 	private boolean isSnapshot() {
@@ -88,10 +91,9 @@ private boolean isSnapshot() {
 
 	@Override
 	public boolean isSnapshotFor(DependencyVersion candidate) {
-		if (!isSnapshot() || !(candidate instanceof ReleaseTrainDependencyVersion)) {
+		if (!isSnapshot() || !(candidate instanceof ReleaseTrainDependencyVersion candidateReleaseTrain)) {
 			return false;
 		}
-		ReleaseTrainDependencyVersion candidateReleaseTrain = (ReleaseTrainDependencyVersion) candidate;
 		return this.releaseTrain.equals(candidateReleaseTrain.releaseTrain);
 	}
 
@@ -127,10 +129,7 @@ public boolean equals(Object obj) {
 			return false;
 		}
 		ReleaseTrainDependencyVersion other = (ReleaseTrainDependencyVersion) obj;
-		if (!this.original.equals(other.original)) {
-			return false;
-		}
-		return true;
+		return this.original.equals(other.original);
 	}
 
 	@Override

buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForProhibitedDependencies.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.
@@ -100,10 +100,7 @@ private boolean prohibited(ModuleVersionIdentifier id) {
 		if (group.equals("org.apache.geronimo.specs")) {
 			return true;
 		}
-		if (group.equals("com.sun.activation")) {
-			return true;
-		}
-		return false;
+		return group.equals("com.sun.activation");
 	}
 
 }

buildSrc/src/main/java/org/springframework/boot/build/context/properties/CheckAdditionalSpringConfigurationMetadata.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -93,7 +93,7 @@ private Report createReport() throws IOException, JsonParseException, JsonMappin
 
 	@SuppressWarnings("unchecked")
 	private void check(String key, Map<String, Object> json, Analysis analysis) {
-		List<Map<String, Object>> groups = (List<Map<String, Object>>) json.get(key);
+		List<Map<String, Object>> groups = (List<Map<String, Object>>) json.getOrDefault(key, Collections.emptyList());
 		List<String> names = groups.stream().map((group) -> (String) group.get("name")).toList();
 		List<String> sortedNames = sortedCopy(names);
 		for (int i = 0; i < names.size(); i++) {

buildSrc/src/main/java/org/springframework/boot/build/context/properties/DocumentConfigurationProperties.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.
@@ -78,8 +78,10 @@ void documentConfigurationProperties() throws IOException {
 		snippets.add("application-properties.security", "Security Properties", this::securityPrefixes);
 		snippets.add("application-properties.rsocket", "RSocket Properties", this::rsocketPrefixes);
 		snippets.add("application-properties.actuator", "Actuator Properties", this::actuatorPrefixes);
-		snippets.add("application-properties.docker-compose", "Docker Compose Properties", this::dockerComposePrefixes);
 		snippets.add("application-properties.devtools", "Devtools Properties", this::devtoolsPrefixes);
+		snippets.add("application-properties.docker-compose", "Docker Compose Properties", this::dockerComposePrefixes);
+		snippets.add("application-properties.testcontainers", "Testcontainers Properties",
+				this::testcontainersPrefixes);
 		snippets.add("application-properties.testing", "Testing Properties", this::testingPrefixes);
 		snippets.writeTo(this.outputDir.toPath());
 	}
@@ -106,6 +108,7 @@ private void corePrefixes(Config config) {
 		config.accept("spring.reactor");
 		config.accept("spring.ssl");
 		config.accept("spring.task");
+		config.accept("spring.threads");
 		config.accept("spring.mandatory-file-encoding");
 		config.accept("info");
 		config.accept("spring.output.ansi.enabled");
@@ -170,6 +173,7 @@ private void integrationPrefixes(Config prefix) {
 		prefix.accept("spring.integration");
 		prefix.accept("spring.jms");
 		prefix.accept("spring.kafka");
+		prefix.accept("spring.pulsar");
 		prefix.accept("spring.rabbitmq");
 		prefix.accept("spring.hazelcast");
 		prefix.accept("spring.webservices");
@@ -211,6 +215,7 @@ private void rsocketPrefixes(Config prefix) {
 
 	private void actuatorPrefixes(Config prefix) {
 		prefix.accept("management");
+		prefix.accept("micrometer");
 	}
 
 	private void dockerComposePrefixes(Config prefix) {
@@ -222,7 +227,11 @@ private void devtoolsPrefixes(Config prefix) {
 	}
 
 	private void testingPrefixes(Config prefix) {
-		prefix.accept("spring.test");
+		prefix.accept("spring.test.");
+	}
+
+	private void testcontainersPrefixes(Config prefix) {
+		prefix.accept("spring.testcontainers.");
 	}
 
 }

buildSrc/src/main/java/org/springframework/boot/build/docs/ApplicationRunner.java

@@ -105,8 +105,8 @@ public Property<String> getApplicationJar() {
 	}
 
 	public void normalizeTomcatPort() {
-		this.normalizations.put("(Tomcat started on port\\(s\\): )[\\d]+( \\(http\\))", "$18080$2");
-		this.normalizations.put("(Tomcat initialized with port\\(s\\): )[\\d]+( \\(http\\))", "$18080$2");
+		this.normalizations.put("(Tomcat started on port )[\\d]+( \\(http\\))", "$18080$2");
+		this.normalizations.put("(Tomcat initialized with port )[\\d]+( \\(http\\))", "$18080$2");
 	}
 
 	public void normalizeLiveReloadPort() {

ci/README.adoc

@@ -11,7 +11,7 @@ The pipeline can be deployed using the following command:
 
 [source]
 ----
-$ fly -t spring-boot set-pipeline -p spring-boot-3.1.x -c ci/pipeline.yml -l ci/parameters.yml
+$ fly -t spring-boot set-pipeline -p spring-boot-3.3.x -c ci/pipeline.yml -l ci/parameters.yml
 ----
 
 NOTE: This assumes that you have credhub integration configured with the appropriate

ci/images/ci-image-jdk21/Dockerfile

@@ -7,6 +7,9 @@ ADD get-docker-url.sh /get-docker-url.sh
 ADD get-docker-compose-url.sh /get-docker-compose-url.sh
 RUN ./setup.sh java17 java21
 
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
 ENV JAVA_HOME /opt/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
 ADD docker-lib.sh /docker-lib.sh

ci/images/ci-image/Dockerfile

@@ -7,6 +7,9 @@ ADD get-docker-url.sh /get-docker-url.sh
 ADD get-docker-compose-url.sh /get-docker-compose-url.sh
 RUN ./setup.sh java17
 
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
 ENV JAVA_HOME /opt/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
 ADD docker-lib.sh /docker-lib.sh

ci/images/setup.sh

@@ -2,12 +2,13 @@
 set -ex
 
 ###########################################################
-# UTILS
+# OS and UTILS
 ###########################################################
 
 export DEBIAN_FRONTEND=noninteractive
 apt-get update
-apt-get install --no-install-recommends -y tzdata ca-certificates net-tools libxml2-utils git curl libudev1 libxml2-utils iptables iproute2 jq
+apt-get install --no-install-recommends -y locales tzdata ca-certificates net-tools libxml2-utils git curl libudev1 libxml2-utils iptables iproute2 jq
+locale-gen en_US.utf8
 ln -fs /usr/share/zoneinfo/UTC /etc/localtime
 dpkg-reconfigure --frontend noninteractive tzdata
 rm -rf /var/lib/apt/lists/*