spring-projects
diff --git a/‎.github/actions/build/action.yml‎
Lines changed: 10 additions & 0 deletions b/‎.github/actions/build/action.yml‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎.github/workflows/build-pull-request.yml‎
Lines changed: 3 additions & 0 deletions b/‎.github/workflows/build-pull-request.yml‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎build-plugin/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java‎
Lines changed: 5 additions & 5 deletions b/‎build-plugin/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java‎
Lines changed: 1 addition & 2 deletions b/‎build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎build-plugin/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageTests.java‎
Lines changed: 3 additions & 4 deletions b/‎build-plugin/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageTests.java‎
Lines changed: 3 additions & 4 deletions
diff --git a/‎build-plugin/spring-boot-maven-plugin/src/docs/antora/modules/maven-plugin/pages/build-image.adoc‎
Lines changed: 2 additions & 0 deletions b/‎build-plugin/spring-boot-maven-plugin/src/docs/antora/modules/maven-plugin/pages/build-image.adoc‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎build-plugin/spring-boot-maven-plugin/src/docs/antora/modules/maven-plugin/pages/packaging.adoc‎
Lines changed: 2 additions & 0 deletions b/‎build-plugin/spring-boot-maven-plugin/src/docs/antora/modules/maven-plugin/pages/packaging.adoc‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuild.java‎
Lines changed: 1 addition & 2 deletions b/‎build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuild.java‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuildExtension.java‎
Lines changed: 1 addition & 2 deletions b/‎build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuildExtension.java‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎build-plugin/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java‎
Lines changed: 0 additions & 17 deletions b/‎build-plugin/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java‎
Lines changed: 0 additions & 17 deletions
@@ -69,6 +69,16 @@ runs:
         COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }}
         COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }}
       run: ./gradlew build
+    - name: Sanity Check
+      id: sanity
+      if: ${{ inputs.publish == 'false' }}
+      shell: bash
+      env:
+        COMMERCIAL_RELEASE_REPO_URL: ${{ inputs.commercial-release-repository-url }}
+        COMMERCIAL_REPO_PASSWORD: ${{ inputs.commercial-repository-password }}
+        COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }}
+        COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }}
+      run: ./gradlew rewriteDryRun -Dorg.gradle.jvmargs=-Xmx12G
     - name: Publish
       id: publish
       if: ${{ inputs.publish == 'true' }}
 
@@ -13,6 +13,9 @@ jobs:
       - name: Build
         id: build
         uses: ./.github/actions/build
+      - name: Sanity
+        id: sanity
+        uses: ./.github/actions/build
       - name: Print JVM Thread Dumps When Cancelled
         if: cancelled()
         uses: ./.github/actions/print-jvm-thread-dumps
 
@@ -354,8 +354,8 @@ void buildsImageWithBindCaches() throws IOException {
 		assertThat(result.getOutput()).contains("---> Test Info buildpack done");
 		removeImages(projectName);
 		String tempDir = System.getProperty("java.io.tmpdir");
-		Path buildCachePath = Paths.get(tempDir, "junit-image-cache-" + projectName + "-build");
-		Path launchCachePath = Paths.get(tempDir, "junit-image-cache-" + projectName + "-launch");
+		Path buildCachePath = Path.of(tempDir, "junit-image-cache-" + projectName + "-build");
+		Path launchCachePath = Path.of(tempDir, "junit-image-cache-" + projectName + "-launch");
 		assertThat(buildCachePath).exists().isDirectory();
 		assertThat(launchCachePath).exists().isDirectory();
 		cleanupCache(buildCachePath);
@@ -595,7 +595,7 @@ private void writeLongNameResource() throws IOException {
 		new Random().ints('a', 'z' + 1).limit(128).forEach((i) -> name.append((char) i));
 		Path path = this.gradleBuild.getProjectDir()
 			.toPath()
-			.resolve(Paths.get("src", "main", "resources", name.toString()));
+			.resolve(Path.of("src", "main", "resources", name.toString()));
 		Files.createDirectories(path.getParent());
 		Files.createFile(path);
 	}
@@ -620,13 +620,13 @@ private void writeBuildpackContent() throws IOException {
 			writer.println("[[stacks]]\n");
 			writer.println("id = \"*\"");
 		}
-		File detect = Files.createFile(Paths.get(binDir.getAbsolutePath(), "detect"), execFileAttribute).toFile();
+		File detect = Files.createFile(Path.of(binDir.getAbsolutePath(), "detect"), execFileAttribute).toFile();
 		try (PrintWriter writer = new PrintWriter(new FileWriter(detect))) {
 			writer.println("#!/usr/bin/env bash");
 			writer.println("set -eo pipefail");
 			writer.println("exit 0");
 		}
-		File build = Files.createFile(Paths.get(binDir.getAbsolutePath(), "build"), execFileAttribute).toFile();
+		File build = Files.createFile(Path.of(binDir.getAbsolutePath(), "build"), execFileAttribute).toFile();
 		try (PrintWriter writer = new PrintWriter(new FileWriter(build))) {
 			writer.println("#!/usr/bin/env bash");
 			writer.println("set -eo pipefail");
 
@@ -26,7 +26,6 @@
 import java.io.StringReader;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Enumeration;
@@ -725,7 +724,7 @@ private void writeResource() {
 		try {
 			Path path = this.gradleBuild.getProjectDir()
 				.toPath()
-				.resolve(Paths.get("src", "main", "resources", "static", "file.txt"));
+				.resolve(Path.of("src", "main", "resources", "static", "file.txt"));
 			Files.createDirectories(path.getParent());
 			Files.createFile(path);
 		}
 
@@ -20,7 +20,6 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.time.OffsetDateTime;
 import java.util.Random;
 import java.util.stream.IntStream;
@@ -455,8 +454,8 @@ void whenBuildImageIsInvokedWithBindCaches(MavenBuild mavenBuild) {
 					.contains("Successfully built image");
 				removeImage("build-image-bind-caches", "0.0.1.BUILD-SNAPSHOT");
 				String tempDir = System.getProperty("java.io.tmpdir");
-				Path buildCachePath = Paths.get(tempDir, "junit-image-cache-" + testBuildId + "-build");
-				Path launchCachePath = Paths.get(tempDir, "junit-image-cache-" + testBuildId + "-launch");
+				Path buildCachePath = Path.of(tempDir, "junit-image-cache-" + testBuildId + "-build");
+				Path launchCachePath = Path.of(tempDir, "junit-image-cache-" + testBuildId + "-launch");
 				assertThat(buildCachePath).exists().isDirectory();
 				assertThat(launchCachePath).exists().isDirectory();
 				cleanupCache(buildCachePath);
@@ -627,7 +626,7 @@ private void writeLongNameResource(File project) {
 		StringBuilder name = new StringBuilder();
 		new Random().ints('a', 'z' + 1).limit(128).forEach((i) -> name.append((char) i));
 		try {
-			Path path = project.toPath().resolve(Paths.get("src", "main", "resources", name.toString()));
+			Path path = project.toPath().resolve(Path.of("src", "main", "resources", name.toString()));
 			Files.createDirectories(path.getParent());
 			Files.createFile(path);
 		}
 
@@ -23,6 +23,8 @@ In the rest of this section, `build-image` is used to refer to either the `build
 TIP: While the buildpack runs from an xref:packaging.adoc[executable archive], it is not necessary to execute the `repackage` goal first as the executable archive is created automatically if necessary.
 When the `build-image` repackages the application, it applies the same settings as the `repackage` goal would, that is dependencies can be excluded using one of the exclude options.
 The `spring-boot-devtools` and `spring-boot-docker-compose` modules are automatically excluded by default (you can control this using the `excludeDevtools` and `excludeDockerCompose` properties).
+Pay also attention that optional dependencies are not included by default.
+If you have defined those modules as optional, you also need to set the `includeOptional` property to `true`.
 
 
 
 
@@ -25,6 +25,8 @@ NOTE: The `outputFileNameMapping` feature of the `maven-war-plugin` is currently
 
 The `spring-boot-devtools` and `spring-boot-docker-compose` modules are automatically excluded by default (you can control this using the `excludeDevtools` and `excludeDockerCompose` properties).
 In order to make that work with `war` packaging, the `spring-boot-devtools` and `spring-boot-docker-compose` dependencies must be set as `optional` or with the `provided` scope.
+Pay also attention that optional dependencies are not included by default.
+If you have defined those modules as optional, you also need to set the `includeOptional` property to `true`.
 
 The plugin rewrites your manifest, and in particular it manages the `Main-Class` and `Start-Class` entries.
 If the defaults don't work you have to configure the values in the Spring Boot plugin, not in the jar plugin.
 
@@ -23,7 +23,6 @@
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardOpenOption;
@@ -163,7 +162,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
 				}
 
 			});
-			String settingsXml = Files.readString(Paths.get("build", "generated-resources", "settings", "settings.xml"))
+			String settingsXml = Files.readString(Path.of("build", "generated-resources", "settings", "settings.xml"))
 				.replace("@localCentralUrl@", new File("build/test-maven-repository").toURI().toURL().toString())
 				.replace("@localRepositoryPath@", new File("build/local-maven-repository").getAbsolutePath());
 			Files.writeString(destination.resolve("settings.xml"), settingsXml, StandardOpenOption.CREATE_NEW);
 
@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Stream;
@@ -49,7 +48,7 @@ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContex
 		try {
 			// Returning a stream which must be closed here is fine, as JUnit will take
 			// care of closing it
-			return Files.list(Paths.get("build/maven-binaries")).map(MavenVersionTestTemplateInvocationContext::new);
+			return Files.list(Path.of("build/maven-binaries")).map(MavenVersionTestTemplateInvocationContext::new);
 		}
 		catch (IOException ex) {
 			throw new RuntimeException(ex);
 
@@ -20,7 +20,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -196,20 +195,4 @@ protected String getArtifactFeature(Artifact artifact) {
 
 	}
 
-	/**
-	 * {@link ArtifactFilter} that only include runtime scopes.
-	 */
-	protected static class RuntimeArtifactFilter implements ArtifactFilter {
-
-		private static final Collection<String> SCOPES = List.of(Artifact.SCOPE_COMPILE,
-				Artifact.SCOPE_COMPILE_PLUS_RUNTIME, Artifact.SCOPE_RUNTIME);
-
-		@Override
-		public boolean include(Artifact artifact) {
-			String scope = artifact.getScope();
-			return !artifact.isOptional() && (scope == null || SCOPES.contains(scope));
-		}
-
-	}
-
 }