Merge branch '2.5.x' into 2.6.x

Closes gh-28904

Author: scottfrederick

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java

@@ -29,6 +29,7 @@
  * @author Dave Syer
  * @author Andy Wilkinson
  * @author Madhura Bhave
+ * @author Scott Frederick
  * @since 1.0.0
  */
 public final class Layouts {
@@ -160,11 +161,6 @@ public String getClassesLocation() {
 			return "WEB-INF/classes/";
 		}
 
-		@Override
-		public String getClasspathIndexFileLocation() {
-			return "WEB-INF/classpath.idx";
-		}
-
 		@Override
 		public String getLayersIndexFileLocation() {
 			return "WEB-INF/layers.idx";

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Packager.java

@@ -516,15 +516,15 @@ void write(AbstractJarWriter writer) throws IOException {
 					writtenPaths.add(path);
 				}
 			}
-			if (getLayout() instanceof RepackagingLayout) {
-				writeClasspathIndex(writtenPaths, (RepackagingLayout) getLayout(), writer);
-			}
+			writeClasspathIndexIfNecessary(writtenPaths, getLayout(), writer);
 		}
 
-		private void writeClasspathIndex(List<String> paths, RepackagingLayout layout, AbstractJarWriter writer)
+		private void writeClasspathIndexIfNecessary(List<String> paths, Layout layout, AbstractJarWriter writer)
 				throws IOException {
-			List<String> names = paths.stream().map((path) -> "- \"" + path + "\"").collect(Collectors.toList());
-			writer.writeIndexFile(layout.getClasspathIndexFileLocation(), names);
+			if (layout.getClasspathIndexFileLocation() != null) {
+				List<String> names = paths.stream().map((path) -> "- \"" + path + "\"").collect(Collectors.toList());
+				writer.writeIndexFile(layout.getClasspathIndexFileLocation(), names);
+			}
 		}
 
 		/**

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/AbstractArchiveIntegrationTests.java

@@ -213,6 +213,11 @@ ManifestAssert hasAttribute(String name, String value) {
 				return this;
 			}
 
+			ManifestAssert doesNotHaveAttribute(String name) {
+				assertThat(this.actual.getMainAttributes().getValue(name)).isNull();
+				return this;
+			}
+
 		}
 
 	}

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/JarIntegrationTests.java

@@ -365,6 +365,16 @@ void whenJarIsRepackagedWithTheCustomLayers(MavenBuild mavenBuild) {
 		});
 	}
 
+	@TestTemplate
+	void repackagedJarContainsClasspathIndex(MavenBuild mavenBuild) {
+		mavenBuild.project("jar").execute((project) -> {
+			File repackaged = new File(project, "target/jar-0.0.1.BUILD-SNAPSHOT.jar");
+			assertThat(jar(repackaged)).manifest(
+					(manifest) -> manifest.hasAttribute("Spring-Boot-Classpath-Index", "BOOT-INF/classpath.idx"));
+			assertThat(jar(repackaged)).hasEntryWithName("BOOT-INF/classpath.idx");
+		});
+	}
+
 	@TestTemplate
 	void whenJarIsRepackagedWithOutputTimestampConfiguredThenJarIsReproducible(MavenBuild mavenBuild)
 			throws InterruptedException {

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/WarIntegrationTests.java

@@ -210,6 +210,16 @@ void whenWarIsRepackagedWithTheCustomLayers(MavenBuild mavenBuild) {
 		});
 	}
 
+	@TestTemplate
+	void repackagedWarDoesNotContainClasspathIndex(MavenBuild mavenBuild) {
+		mavenBuild.project("war").execute((project) -> {
+			File repackaged = new File(project, "target/war-0.0.1.BUILD-SNAPSHOT.war");
+			assertThat(jar(repackaged))
+					.manifest((manifest) -> manifest.doesNotHaveAttribute("Spring-Boot-Classpath-Index"));
+			assertThat(jar(repackaged)).doesNotHaveEntryWithName("BOOT-INF/classpath.idx");
+		});
+	}
+
 	@TestTemplate
 	void whenEntryIsExcludedItShouldNotBePresentInTheRepackagedWar(MavenBuild mavenBuild) {
 		mavenBuild.project("war-exclude-entry").execute((project) -> {