File handle in SpringBootJoranConfigurator should be closed

.github/workflows/build-and-deploy-snapshot.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - '4.0.x'
+      - 'main'
 permissions:
   contents: read
 concurrency:
@@ -30,7 +30,7 @@ jobs:
       - name: Deploy
         uses: spring-io/artifactory-deploy-action@926d7f7cc810569395346bf3a4d91b380b3e355b # v0.0.4
         with:
-          build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', '4.0.x') || format('spring-boot-{0}', '4.0.x') }}
+          build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', '4.2.x') || format('spring-boot-{0}', '4.2.x') }}
           folder: 'deployment-repository'
           password: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_ARTIFACTORY_PASSWORD || secrets.ARTIFACTORY_PASSWORD }}
           project: ${{ vars.COMMERCIAL && 'spring' }}

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: CI
 on:
   push:
     branches:
-      - '4.0.x'
+      - 'main'
 permissions:
   contents: read
 jobs:

.github/workflows/release-milestone.yml

@@ -2,8 +2,8 @@ name: Release Milestone
 on:
   push:
     tags:
-      - v4.0.0-M[0-9]
-      - v4.0.0-RC[0-9]
+      - v4.2.0-M[0-9]
+      - v4.2.0-RC[0-9]
 permissions:
   contents: read
 concurrency:

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Release
 on:
   push:
     tags:
-      - v4.0.[0-9]+
+      - v4.2.[0-9]+
 permissions:
   contents: read
 concurrency:
@@ -126,7 +126,7 @@ jobs:
       - name: Publish to SDKMAN!
         uses: ./.github/actions/publish-to-sdkman
         with:
-          make-default: false
+          make-default: true
           sdkman-consumer-key: ${{ secrets.SDKMAN_CONSUMER_KEY }}
           sdkman-consumer-token: ${{ secrets.SDKMAN_CONSUMER_TOKEN }}
           spring-boot-version: ${{ needs.build-and-stage-release.outputs.version }}
@@ -174,5 +174,6 @@ jobs:
         uses: ./.github/actions/create-github-release
         with:
           commercial: ${{ vars.COMMERCIAL }}
+          latest: true
           milestone: ${{ needs.build-and-stage-release.outputs.version }}
           token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}

.github/workflows/run-system-tests.yml

@@ -2,12 +2,12 @@ name: Run System Tests
 on:
   push:
     branches:
-      - '4.0.x'
+      - "main"
 permissions:
   contents: read
 jobs:
   run-system-tests:
-    name: 'Java ${{ matrix.java.version}}'
+    name: "Java ${{ matrix.java.version}}"
     if: ${{ github.repository == 'spring-projects/spring-boot' }}
     runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
     strategy:

.github/workflows/trigger-docs-build.yml

@@ -1,7 +1,7 @@
 name: Trigger Docs Build
 on:
   push:
-    branches: '4.0.x'
+    branches: 'main'
     paths: [ 'antora/*' ]
   workflow_dispatch:
     inputs:

README.adoc

@@ -1,4 +1,4 @@
-= Spring Boot image:https://github.com/spring-projects/spring-boot/actions/workflows/build-and-deploy-snapshot.yml/badge.svg?branch=4.0.x["Build Status", link="https://github.com/spring-projects/spring-boot/actions/workflows/build-and-deploy-snapshot.yml?query=branch%3A4.0.x"] 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://github.com/spring-projects/spring-boot/actions/workflows/build-and-deploy-snapshot.yml/badge.svg?branch=main["Build Status", link="https://github.com/spring-projects/spring-boot/actions/workflows/build-and-deploy-snapshot.yml?query=branch%3Amain"] 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
 :github: https://github.com/spring-projects/spring-boot

build-plugin/spring-boot-gradle-plugin/build.gradle

@@ -49,6 +49,7 @@ dependencies {
 	implementation("org.apache.commons:commons-compress")
 	implementation("org.springframework:spring-core")
 
+	optional("com.google.protobuf:protobuf-gradle-plugin")
 	optional("org.graalvm.buildtools:native-gradle-plugin")
 	optional("org.cyclonedx:cyclonedx-gradle-plugin") {
 		exclude(group: "javax.annotation", module: "javax.annotation-api")
@@ -64,6 +65,7 @@ dependencies {
 	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 	testImplementation("org.graalvm.buildtools:native-gradle-plugin")
 	testImplementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+	testImplementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlinVersion")
 	testImplementation("org.jetbrains.kotlin:kotlin-compiler-runner:$kotlinVersion")
 	testImplementation("org.jetbrains.kotlin:kotlin-daemon-client:$kotlinVersion")
 	testImplementation("org.tomlj:tomlj:1.0.0")

build-plugin/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java

@@ -469,6 +469,20 @@ void buildsImageOnLinuxArmWithImagePlatformLinuxArm() throws IOException {
 		removeImages(projectName, builderImage, runImage, buildpackImage);
 	}
 
+	@TestTemplate
+	void buildsImageWithMultipleCommandLineEnvironments() throws IOException {
+		writeMainClass();
+		writeLongNameResource();
+		BuildResult result = this.gradleBuild.build("bootBuildImage", "--environment", "BP_LIVE_RELOAD_ENABLED=true",
+				"--environment", "MY_CUSTOM_VAR=hello_world");
+		BuildTask task = result.task(":bootBuildImage");
+		assertThat(task).isNotNull();
+		assertThat(task.getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
+		assertThat(result.getOutput()).contains("BP_LIVE_RELOAD_ENABLED=true");
+		assertThat(result.getOutput()).contains("MY_CUSTOM_VAR=hello_world");
+		removeImages(this.gradleBuild.getProjectDir().getName());
+	}
+
 	@TestTemplate
 	@EnabledOnOs(value = { OS.LINUX, OS.MAC }, architectures = "amd64",
 			disabledReason = "The expected failure condition will not fail on ARM architectures")

build-plugin/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/packaging/boot-build-image-image-caches.gradle

@@ -0,0 +1,24 @@
+plugins {
+	id 'java'
+	id 'org.springframework.boot' version '{version-spring-boot}'
+}
+
+tasks.named("bootJar") {
+	mainClass = 'com.example.ExampleApplication'
+}
+
+// tag::caches[]
+tasks.named("bootBuildImage") {
+	buildCache {
+		image {
+			name = "docker.io/library/${rootProject.name}:build"
+		}
+	}
+}
+// end::caches[]
+
+tasks.register("bootBuildImageCaches") {
+	doFirst {
+		bootBuildImage.buildCache.asCache().with { println "buildCache=$name" }
+	}
+}

build-plugin/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/packaging/boot-build-image-image-caches.gradle.kts

@@ -0,0 +1,22 @@
+import org.springframework.boot.gradle.tasks.bundling.BootBuildImage
+
+plugins {
+	java
+	id("org.springframework.boot") version "{version-spring-boot}"
+}
+
+// tag::caches[]
+tasks.named<BootBuildImage>("bootBuildImage") {
+	buildCache {
+		image {
+			name.set("docker.io/library/${rootProject.name}:build")
+		}
+	}
+}
+// end::caches[]
+
+tasks.register("bootBuildImageCaches") {
+	doFirst {
+		println("buildCache=" + tasks.getByName<BootBuildImage>("bootBuildImage").buildCache.asCache()?.image?.name)
+	}
+}

build-plugin/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/integrating-with-actuator.adoc

@@ -26,8 +26,9 @@ include::example$integrating-with-actuator/build-info-basic.gradle.kts[tags=buil
 ----
 ======
 
-This will configure a {apiref-gradle-plugin-boot-build-info}[`BuildInfo`] task named `bootBuildInfo` and, if it exists, make the Java plugin's `classes` task depend upon it.
-The task's destination directory will be `META-INF` in the output directory of the main source set's resources (typically `build/resources/main`).
+This will configure a {apiref-gradle-plugin-boot-build-info}[`BuildInfo`] task named `bootBuildInfo`.
+The task's destination directory will be `build/bootBuildInfo` and its filename will be `META-INF/build-info.properties`.
+If the main source set exists, its resources are configured to use the output of the `bootBuildInfo` task as a src dir.
 
 By default, the generated build information is derived from the project:
 

build-plugin/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/packaging-oci-image.adoc

@@ -162,7 +162,7 @@ Acceptable values are `ALWAYS`, `NEVER`, and `IF_NOT_PRESENT`.
 | `ALWAYS`
 
 | `environment`
-|
+| `--environment`
 | Environment variables that should be passed to the builder.
 | Empty.
 
@@ -346,6 +346,15 @@ include::example$packaging/boot-build-image-env.gradle.kts[tags=env]
 ----
 ======
 
+Environment variables can also be specified on the command line, as shown in the following example:
+
+[source,shell]
+----
+$ gradle bootBuildImage --environment BP_JVM_VERSION=17
+----
+
+`--environment` can be used multiple times to specify multiple environment variables.
+
 If there is a network proxy between the Docker daemon the builder runs in and network locations that buildpacks download artifacts from, you will need to configure the builder to use the proxy.
 When using the Paketo builder, this can be accomplished by setting the `HTTPS_PROXY` and/or `HTTP_PROXY` environment variables as show in the following example:
 
@@ -564,6 +573,24 @@ include::example$packaging/boot-build-image-bind-caches.gradle.kts[tags=caches]
 ----
 ======
 
+The build cache can also be stored in an image instead of a named volume, which allows the cache to be shared between hosts by pushing and pulling it from an image registry, as shown in the following example:
+
+[tabs]
+======
+Groovy::
++
+[source,groovy,indent=0,subs="verbatim,attributes"]
+----
+include::example$packaging/boot-build-image-image-caches.gradle[tags=caches]
+----
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,attributes"]
+----
+include::example$packaging/boot-build-image-image-caches.gradle.kts[tags=caches]
+----
+======
+
 
 
 [[build-image.examples.docker]]

build-plugin/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/reacting.adoc

@@ -104,3 +104,17 @@ When the {url-cyclonedx-docs-gradle-plugin}[CycloneDX plugin] is applied to a pr
 .. Disable full license texts.
 . Adds the SBOM under `META-INF/sbom` in the generated jar or war file.
 . Adds the `Sbom-Format` and `Sbom-Location` to the manifest of the jar or war file.
+
+
+
+[[reacting-to-other-plugins.protobuf]]
+== Reacting to the Protobuf Plugin
+
+When the {url-protobuf-docs-gradle-plugin}[Protobuf plugin] is applied to a project, the Spring Boot plugin:
+
+. Configures `protoc` to use the artifact `com.google.protobuf:protoc`, aligning its version with that of Protobuf dependencies on the runtime classpath.
+
+Additionally, when the Protobuf `grpc` plugin is configured, the Spring Boot plugin:
+
+. Configures it to use the artifact `io.grpc:protoc-gen-grpc-java`, aligning its version with that of gRPC dependencies on the runtime classpath.
+. Configures the `grpc` plugin of all generate proto tasks with the option `@generated=omit`.

build-plugin/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java

@@ -16,10 +16,9 @@
 
 package org.springframework.boot.gradle.dsl;
 
-import java.io.File;
-
 import org.gradle.api.Action;
 import org.gradle.api.Project;
+import org.gradle.api.file.SourceDirectorySet;
 import org.gradle.api.plugins.BasePlugin;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.JavaPluginExtension;
@@ -31,7 +30,6 @@
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.boot.gradle.tasks.buildinfo.BuildInfo;
-import org.springframework.util.Assert;
 
 /**
  * Entry point to Spring Boot's Gradle DSL.
@@ -66,36 +64,41 @@ public Property<String> getMainClass() {
 	}
 
 	/**
-	 * Creates a new {@link BuildInfo} task named {@code bootBuildInfo} and configures the
-	 * Java plugin's {@code classes} task to depend upon it.
+	 * Creates a new {@link BuildInfo} task named {@code bootBuildInfo} and adds its
+	 * output as a {@link SourceDirectorySet#srcDir source directory} of the main source
+	 * set's {@link SourceSet#getResources resources}.
 	 * <p>
-	 * By default, the task's destination dir will be a directory named {@code META-INF}
-	 * beneath the main source set's resources output directory, and the task's project
-	 * artifact will be the base name of the {@code bootWar} or {@code bootJar} task.
+	 * By default, the task's project artifact will be the archive base name of the
+	 * {@code bootWar} or {@code bootJar} task.
 	 */
 	public void buildInfo() {
 		buildInfo(null);
 	}
 
 	/**
-	 * Creates a new {@link BuildInfo} task named {@code bootBuildInfo} and configures the
-	 * Java plugin's {@code classes} task to depend upon it. The task is passed to the
-	 * given {@code configurer} for further configuration.
+	 * Creates a new {@link BuildInfo} task named {@code bootBuildInfo} and adds its
+	 * output as a {@link SourceDirectorySet#srcDir source directory} of the main source
+	 * set's {@link SourceSet#getResources resources}. The task is passed to the given
+	 * {@code configurer} for further configuration.
 	 * <p>
-	 * By default, the task's destination dir will be a directory named {@code META-INF}
-	 * beneath the main source set's resources output directory, and the task's project
-	 * artifact will be the base name of the {@code bootWar} or {@code bootJar} task.
+	 * By default, the task's project artifact will be the archive base name of the
+	 * {@code bootWar} or {@code bootJar} task.
 	 * @param configurer the task configurer
 	 */
 	public void buildInfo(@Nullable Action<BuildInfo> configurer) {
 		TaskContainer tasks = this.project.getTasks();
 		TaskProvider<BuildInfo> bootBuildInfo = tasks.register("bootBuildInfo", BuildInfo.class,
 				this::configureBuildInfoTask);
 		this.project.getPlugins().withType(JavaPlugin.class, (plugin) -> {
-			tasks.named(JavaPlugin.CLASSES_TASK_NAME).configure((task) -> task.dependsOn(bootBuildInfo));
 			bootBuildInfo.configure((buildInfo) -> buildInfo.getProperties()
 				.getArtifact()
 				.convention(this.project.provider(this::determineArtifactBaseName)));
+			this.project.getExtensions()
+				.getByType(JavaPluginExtension.class)
+				.getSourceSets()
+				.getByName(SourceSet.MAIN_SOURCE_SET_NAME)
+				.getResources()
+				.srcDir(bootBuildInfo);
 		});
 		if (configurer != null) {
 			bootBuildInfo.configure(configurer);
@@ -105,20 +108,6 @@ public void buildInfo(@Nullable Action<BuildInfo> configurer) {
 	private void configureBuildInfoTask(BuildInfo task) {
 		task.setGroup(BasePlugin.BUILD_GROUP);
 		task.setDescription("Generates a META-INF/build-info.properties file.");
-		task.getDestinationDir()
-			.convention(this.project.getLayout()
-				.dir(this.project.provider(() -> new File(determineMainSourceSetResourcesOutputDir(), "META-INF"))));
-	}
-
-	private File determineMainSourceSetResourcesOutputDir() {
-		File resourcesDir = this.project.getExtensions()
-			.getByType(JavaPluginExtension.class)
-			.getSourceSets()
-			.getByName(SourceSet.MAIN_SOURCE_SET_NAME)
-			.getOutput()
-			.getResourcesDir();
-		Assert.state(resourcesDir != null, "'resourcesDir' must not be null");
-		return resourcesDir;
 	}
 
 	private @Nullable String determineArtifactBaseName() {