Remove unnecessary JobOperator bean definition from BatchAutoConfiguration

.git-blame-ignore-revs

@@ -2,5 +2,6 @@
 # Reformat code following spring-javaformat upgrade
 df5898a1464112f185d295d585740de696934a12
 c4de86c244acdcff69ed0aecacd254399be79ce2
+b07269a018a4a9d4c029aba7dd8a15fa66df681c
 
 

README.adoc

@@ -1,4 +1,4 @@
-= Spring Boot image:https://ci.spring.io/api/v1/teams/spring-boot/pipelines/spring-boot-3.0.x/jobs/build/badge["Build Status", link="https://ci.spring.io/teams/spring-boot/pipelines/spring-boot-3.0.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-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Gradle Enterprise", 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.2.x/jobs/build/badge["Build Status", link="https://ci.spring.io/teams/spring-boot/pipelines/spring-boot-3.2.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-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Gradle Enterprise", 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

@@ -18,10 +18,11 @@ new File(projectDir.parentFile, "gradle.properties").withInputStream {
 	def properties = new Properties()
 	properties.load(it)
 	["assertj", "commonsCodec", "hamcrest", "jackson", "junitJupiter",
-		"kotlin", "maven", "springFramework"].each {
+		"kotlin", "maven"].each {
 		versions[it] = properties[it + "Version"]
 	}
 }
+versions["springFramework"] = "6.0.12"
 ext.set("versions", versions)
 if (versions.springFramework.contains("-")) {
 	repositories {

buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java

@@ -134,7 +134,7 @@ private void configureForkOptions(AbstractAsciidoctorTask asciidoctorTask) {
 
 	private String determineGitHubTag(Project project) {
 		String version = "v" + project.getVersion();
-		return (version.endsWith("-SNAPSHOT")) ? "3.0.x" : version;
+		return (version.endsWith("-SNAPSHOT")) ? "main" : version;
 	}
 
 	private void configureOptions(AbstractAsciidoctorTask asciidoctorTask) {

buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java

@@ -48,6 +48,7 @@ public void apply(Project project) {
 		new AsciidoctorConventions().apply(project);
 		new KotlinConventions().apply(project);
 		new WarConventions().apply(project);
+		new EclipseConventions().apply(project);
 	}
 
 }

buildSrc/src/main/java/org/springframework/boot/build/EclipseConventions.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2023-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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.build;
+
+import org.gradle.api.Project;
+import org.gradle.plugins.ide.api.XmlFileContentMerger;
+import org.gradle.plugins.ide.eclipse.EclipsePlugin;
+import org.gradle.plugins.ide.eclipse.model.Classpath;
+import org.gradle.plugins.ide.eclipse.model.ClasspathEntry;
+import org.gradle.plugins.ide.eclipse.model.EclipseClasspath;
+import org.gradle.plugins.ide.eclipse.model.EclipseModel;
+import org.gradle.plugins.ide.eclipse.model.Library;
+
+/**
+ * Conventions that are applied in the presence of the {@link EclipsePlugin} to work
+ * around buildship issue {@code #1238}.
+ *
+ * @author Phillip Webb
+ */
+class EclipseConventions {
+
+	void apply(Project project) {
+		project.getPlugins().withType(EclipsePlugin.class, (eclipse) -> {
+			EclipseModel eclipseModel = project.getExtensions().getByType(EclipseModel.class);
+			eclipseModel.classpath(this::configureClasspath);
+		});
+	}
+
+	private void configureClasspath(EclipseClasspath classpath) {
+		classpath.file(this::configureClasspathFile);
+	}
+
+	private void configureClasspathFile(XmlFileContentMerger merger) {
+		merger.whenMerged((content) -> {
+			if (content instanceof Classpath classpath) {
+				classpath.getEntries().removeIf(this::isKotlinPluginContributedBuildDirectory);
+			}
+		});
+	}
+
+	private boolean isKotlinPluginContributedBuildDirectory(ClasspathEntry entry) {
+		return (entry instanceof Library library) && isKotlinPluginContributedBuildDirectory(library.getPath())
+				&& isTest(library);
+	}
+
+	private boolean isKotlinPluginContributedBuildDirectory(String path) {
+		return path.contains("/main") && (path.contains("/build/classes/") || path.contains("/build/resources/"));
+	}
+
+	private boolean isTest(Library library) {
+		Object value = library.getEntryAttributes().get("test");
+		return (value instanceof String string && Boolean.parseBoolean(string));
+	}
+
+}

buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/AutoConfigurationPlugin.java

@@ -42,15 +42,13 @@
 import org.springframework.boot.build.DeployedPlugin;
 import org.springframework.boot.build.architecture.ArchitectureCheck;
 import org.springframework.boot.build.architecture.ArchitecturePlugin;
-import org.springframework.boot.build.context.properties.ConfigurationPropertiesPlugin;
 
 /**
  * {@link Plugin} for projects that define auto-configuration. When applied, the plugin
  * applies the {@link DeployedPlugin}. Additionally, when the {@link JavaPlugin} is
  * applied it:
  *
  * <ul>
- * <li>Applies the {@link ConfigurationPropertiesPlugin}.
  * <li>Adds a dependency on the auto-configuration annotation processor.
  * <li>Defines a task that produces metadata describing the auto-configuration. The
  * metadata is made available as an artifact in the {@code autoConfigurationMetadata}
@@ -79,7 +77,6 @@ public class AutoConfigurationPlugin implements Plugin<Project> {
 	public void apply(Project project) {
 		project.getPlugins().apply(DeployedPlugin.class);
 		project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> {
-			project.getPlugins().apply(ConfigurationPropertiesPlugin.class);
 			Configuration annotationProcessors = project.getConfigurations()
 				.getByName(JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME);
 			annotationProcessors.getDependencies()

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

@@ -58,7 +58,18 @@ final class MavenMetadataVersionResolver implements VersionResolver {
 
 	MavenMetadataVersionResolver(RestTemplate restTemplate, Collection<URI> repositoryUrls) {
 		this.rest = restTemplate;
-		this.repositoryUrls = repositoryUrls;
+		this.repositoryUrls = normalize(repositoryUrls);
+	}
+
+	private Collection<URI> normalize(Collection<URI> uris) {
+		return uris.stream().map(this::normalize).toList();
+	}
+
+	private URI normalize(URI uri) {
+		if ("/".equals(uri.getPath())) {
+			return uri;
+		}
+		return URI.create(uri.toString() + "/");
 	}
 
 	@Override

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

@@ -19,13 +19,11 @@
 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.SortedSet;
 import java.util.function.BiPredicate;
-import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -96,19 +94,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/version/ArtifactVersionDependencyVersion.java

@@ -16,6 +16,7 @@
 
 package org.springframework.boot.build.bom.bomr.version;
 
+import java.util.Objects;
 import java.util.Optional;
 
 import org.apache.maven.artifact.versioning.ArtifactVersion;
@@ -121,6 +122,21 @@ public boolean isSnapshotFor(DependencyVersion candidate) {
 		return sameMajorMinorIncremental(((ArtifactVersionDependencyVersion) candidate).artifactVersion);
 	}
 
+	@Override
+	public int compareTo(DependencyVersion other) {
+		if (other instanceof ArtifactVersionDependencyVersion otherArtifactDependencyVersion) {
+			ArtifactVersion otherArtifactVersion = otherArtifactDependencyVersion.artifactVersion;
+			if ((!Objects.equals(this.artifactVersion.getQualifier(), otherArtifactVersion.getQualifier()))
+					&& "snapshot".equalsIgnoreCase(otherArtifactVersion.getQualifier())
+					&& otherArtifactVersion.getMajorVersion() == this.artifactVersion.getMajorVersion()
+					&& otherArtifactVersion.getMinorVersion() == this.artifactVersion.getMinorVersion()
+					&& otherArtifactVersion.getIncrementalVersion() == this.artifactVersion.getIncrementalVersion()) {
+				return 1;
+			}
+		}
+		return super.compareTo(other);
+	}
+
 	@Override
 	public String toString() {
 		return this.artifactVersion.toString();

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-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.
@@ -79,6 +79,9 @@ void documentConfigurationProperties() throws IOException {
 		snippets.add("application-properties.rsocket", "RSocket Properties", this::rsocketPrefixes);
 		snippets.add("application-properties.actuator", "Actuator Properties", this::actuatorPrefixes);
 		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());
 	}
@@ -103,7 +106,9 @@ private void corePrefixes(Config config) {
 		config.accept("spring.profiles");
 		config.accept("spring.quartz");
 		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");
@@ -168,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,12 +217,20 @@ private void actuatorPrefixes(Config prefix) {
 		prefix.accept("management");
 	}
 
+	private void dockerComposePrefixes(Config prefix) {
+		prefix.accept("spring.docker.compose");
+	}
+
 	private void devtoolsPrefixes(Config prefix) {
 		prefix.accept("spring.devtools");
 	}
 
 	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() {

buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenExec.java

@@ -86,8 +86,8 @@ private Configuration mavenConfiguration(Project project) {
 			return existing;
 		}
 		return project.getConfigurations().create("maven", (maven) -> {
-			maven.getDependencies().add(project.getDependencies().create("org.apache.maven:maven-embedder:3.6.2"));
-			maven.getDependencies().add(project.getDependencies().create("org.apache.maven:maven-compat:3.6.2"));
+			maven.getDependencies().add(project.getDependencies().create("org.apache.maven:maven-embedder:3.6.3"));
+			maven.getDependencies().add(project.getDependencies().create("org.apache.maven:maven-compat:3.6.3"));
 			maven.getDependencies().add(project.getDependencies().create("org.slf4j:slf4j-simple:1.7.5"));
 			maven.getDependencies()
 				.add(project.getDependencies()

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.0.x -c ci/pipeline.yml -l ci/parameters.yml
+$ fly -t spring-boot set-pipeline -p spring-boot-3.2.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

@@ -3,8 +3,12 @@ FROM ubuntu:jammy-20231004
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
 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

@@ -3,8 +3,12 @@ FROM ubuntu:jammy-20231004
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
 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/get-docker-compose-url.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+
+version="2.17.0"
+echo "https://github.com/docker/compose/releases/download/v$version/docker-compose-linux-x86_64"