Merge branch 'spring-projects:main' into add-support-autoconfiguration-for-static-master-replica

Author: facewise

.github/actions/prepare-gradle-build/action.yml

@@ -34,20 +34,20 @@ runs:
         tool-cache: true
         docker-images: false
     - name: Set Up Java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: ${{ inputs.java-early-access == 'true' && 'temurin' || (inputs.java-distribution || 'liberica') }}
         java-version: |
           ${{ inputs.java-early-access == 'true' && format('{0}-ea', inputs.java-version) || inputs.java-version }}
           ${{ inputs.java-toolchain == 'true' && '24' || '' }}
     - name: Set Up Gradle With Read/Write Cache
       if: ${{ inputs.cache-read-only == 'false' }}
-      uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
       with:
         cache-read-only: false
         develocity-access-key: ${{ inputs.develocity-access-key }}
     - name: Set Up Gradle
-      uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
       with:
         develocity-access-key: ${{ inputs.develocity-access-key }}
         develocity-token-expiry: 4

.github/actions/publish-gradle-plugin/action.yml

@@ -21,14 +21,14 @@ runs:
   using: composite
   steps:
     - name: Set Up JFrog CLI
-      uses: jfrog/setup-jfrog-cli@2bc6e55719cd37dfb2f655a1e4f16c3440182a9f # v4.5.13
+      uses: jfrog/setup-jfrog-cli@88e9eba31c07e31beefa4cef5c0e93d1af9535d7 # v4.6.1
       env:
         JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }}
     - name: Download Artifacts
       shell: bash
       run: jf rt download --spec ${{ format('{0}/artifacts.spec', github.action_path) }} --spec-vars 'buildName=${{ format('spring-boot-{0}', inputs.plugin-version) }};buildNumber=${{ inputs.build-number }}'
     - name: Set Up Java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: 'liberica'
         java-version: '17'

.github/actions/sync-to-maven-central/action.yml

@@ -17,7 +17,7 @@ runs:
   using: composite
   steps:
     - name: Set Up JFrog CLI
-      uses: jfrog/setup-jfrog-cli@2bc6e55719cd37dfb2f655a1e4f16c3440182a9f # v4.5.13
+      uses: jfrog/setup-jfrog-cli@88e9eba31c07e31beefa4cef5c0e93d1af9535d7 # v4.6.1
       env:
         JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }}
     - name: Download Release Artifacts

.github/dependabot.yml

@@ -6,3 +6,11 @@ updates:
       interval: "weekly"
     labels:
       - "type: task"
+      - "status: waiting-for-triage"
+  - package-ecosystem: "npm"
+    directory: "/antora"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "type: task"
+      - "status: waiting-for-triage"

.github/workflows/release-milestone.yml

@@ -75,7 +75,7 @@ jobs:
     runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
     steps:
       - name: Set up JFrog CLI
-        uses: jfrog/setup-jfrog-cli@2bc6e55719cd37dfb2f655a1e4f16c3440182a9f # v4.5.13
+        uses: jfrog/setup-jfrog-cli@88e9eba31c07e31beefa4cef5c0e93d1af9535d7 # v4.6.1
         env:
           JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
       - name: Promote build

.github/workflows/release.yml

@@ -86,7 +86,7 @@ jobs:
     runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
     steps:
       - name: Set up JFrog CLI
-        uses: jfrog/setup-jfrog-cli@2bc6e55719cd37dfb2f655a1e4f16c3440182a9f # v4.5.13
+        uses: jfrog/setup-jfrog-cli@88e9eba31c07e31beefa4cef5c0e93d1af9535d7 # v4.6.1
         env:
           JF_ENV_SPRING: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_JF_ARTIFACTORY_SPRING || secrets.JF_ARTIFACTORY_SPRING }}
       - name: Promote open source build

.github/workflows/verify.yml

@@ -49,7 +49,7 @@ jobs:
           path: send-notification
           sparse-checkout: .github/actions/send-notification
       - name: Set Up Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'liberica'
           java-version: 17
@@ -59,7 +59,7 @@ jobs:
         with:
           stable: true
       - name: Set Up Gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+        uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
         with:
           cache-read-only: false
       - name: Configure Gradle Properties

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

@@ -59,8 +59,6 @@ dependencies {
 
 	testImplementation(project(":test-support:spring-boot-gradle-test-support"))
 	testImplementation(project(":test-support:spring-boot-test-support"))
-	testImplementation("com.fasterxml.jackson.core:jackson-databind")
-	testImplementation("com.fasterxml.jackson.module:jackson-module-parameter-names")
 	testImplementation("com.tngtech.archunit:archunit-junit5:1.4.0")
 	testImplementation("net.java.dev.jna:jna-platform")
 	testImplementation("org.apache.commons:commons-compress")
@@ -70,6 +68,7 @@ dependencies {
 	testImplementation("org.jetbrains.kotlin:kotlin-compiler-runner:$kotlinVersion")
 	testImplementation("org.jetbrains.kotlin:kotlin-daemon-client:$kotlinVersion")
 	testImplementation("org.tomlj:tomlj:1.0.0")
+	testImplementation("tools.jackson.core:jackson-databind")
 }
 
 repositories {

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

@@ -17,6 +17,7 @@
 package org.springframework.boot.gradle.plugin;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringWriter;
 import java.util.concurrent.Callable;
@@ -38,6 +39,7 @@
 import org.gradle.util.GradleVersion;
 
 import org.springframework.boot.gradle.tasks.run.BootRun;
+import org.springframework.util.Assert;
 
 /**
  * Action that is executed in response to the {@link ApplicationPlugin} being applied.
@@ -110,7 +112,7 @@ public Class<? extends Plugin<Project>> getPluginClass() {
 	}
 
 	private String loadResource(String name) {
-		try (InputStreamReader reader = new InputStreamReader(getClass().getResourceAsStream(name))) {
+		try (InputStreamReader reader = new InputStreamReader(getResourceAsStream(name))) {
 			char[] buffer = new char[4096];
 			int read;
 			StringWriter writer = new StringWriter();
@@ -124,6 +126,12 @@ private String loadResource(String name) {
 		}
 	}
 
+	private InputStream getResourceAsStream(String name) {
+		InputStream stream = getClass().getResourceAsStream(name);
+		Assert.state(stream != null, "Resource '%s' not found'".formatted(name));
+		return stream;
+	}
+
 	private void configureFilePermissions(CopySpec copySpec, int mode) {
 		if (GradleVersion.current().compareTo(GradleVersion.version("8.3")) >= 0) {
 			copySpec.filePermissions((filePermissions) -> filePermissions.unix(Integer.toString(mode, 8)));

build-plugin/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoProperties.java

@@ -48,7 +48,7 @@ public abstract class BuildInfoProperties implements Serializable {
 
 	private final SetProperty<String> excludes;
 
-	private final Supplier<String> creationTime = () -> DateTimeFormatter.ISO_INSTANT.format(Instant.now());
+	private final Supplier<@Nullable String> creationTime = () -> DateTimeFormatter.ISO_INSTANT.format(Instant.now());
 
 	@Inject
 	public BuildInfoProperties(Project project, SetProperty<String> excludes) {
@@ -143,14 +143,18 @@ Map<String, String> getAdditionalIfNotExcluded() {
 	}
 
 	private <T> @Nullable T getIfNotExcluded(Property<T> property, String name) {
-		return getIfNotExcluded(property, name, () -> null);
+		Supplier<@Nullable T> supplier = () -> null;
+		return getIfNotExcluded(property, name, supplier);
 	}
 
-	private <T> @Nullable T getIfNotExcluded(Property<T> property, String name, Supplier<T> defaultValue) {
+	private <T> @Nullable T getIfNotExcluded(Property<T> property, String name, Supplier<@Nullable T> defaultValue) {
 		if (this.excludes.getOrElse(Collections.emptySet()).contains(name)) {
 			return null;
 		}
-		return property.getOrElse(defaultValue.get());
+		if (property.isPresent()) {
+			return property.get();
+		}
+		return defaultValue.get();
 	}
 
 	private Map<String, String> coerceToStringValues(Map<String, Object> input) {
@@ -159,15 +163,22 @@ private Map<String, String> coerceToStringValues(Map<String, Object> input) {
 			if (value instanceof Provider<?> provider) {
 				value = provider.getOrNull();
 			}
-			output.put(key, (value != null) ? value.toString() : null);
+			if (value != null) {
+				output.put(key, value.toString());
+			}
 		});
 		return output;
 	}
 
 	private Map<String, Object> applyExclusions(Map<String, Object> input) {
 		Map<String, Object> output = new HashMap<>();
 		Set<String> exclusions = this.excludes.getOrElse(Collections.emptySet());
-		input.forEach((key, value) -> output.put(key, (!exclusions.contains(key)) ? value : null));
+		input.forEach((key, value) -> {
+			boolean isExcluded = exclusions.contains(key);
+			if (!isExcluded) {
+				output.put(key, value);
+			}
+		});
 		return output;
 	}