Polish "Remove unused SHA-1 hash from UNPACK markers"

See gh-46520

Author: wilkinsona

build-plugin/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootZipCopyAction.java

@@ -610,7 +610,7 @@ void prepareStoredEntry(ZipArchiveEntry entry) {
 			entry.setCrc(this.crc.getValue());
 			entry.setMethod(ZipEntry.STORED);
 			if (this.unpack) {
-				entry.setComment("UNPACK:");
+				entry.setComment("UNPACK");
 			}
 		}
 

build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PackagingDocumentationTests.java

@@ -124,7 +124,7 @@ void bootJarRequiresUnpack() throws IOException {
 		try (JarFile jar = new JarFile(file)) {
 			JarEntry entry = jar.getJarEntry("BOOT-INF/lib/jruby-complete-1.7.25.jar");
 			assertThat(entry).isNotNull();
-			assertThat(entry.getComment()).startsWith("UNPACK:");
+			assertThat(entry.getComment()).isEqualTo("UNPACK");
 		}
 	}
 

build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveTests.java

@@ -289,7 +289,7 @@ void unpackCommentIsAddedToEntryIdentifiedByAPattern() throws IOException {
 		this.task.requiresUnpack("**/one.jar");
 		executeTask();
 		try (JarFile jarFile = new JarFile(this.task.getArchiveFile().get().getAsFile())) {
-			assertThat(jarFile.getEntry(this.libPath + "one.jar").getComment()).startsWith("UNPACK:");
+			assertThat(jarFile.getEntry(this.libPath + "one.jar").getComment()).isEqualTo("UNPACK");
 			assertThat(jarFile.getEntry(this.libPath + "two.jar").getComment()).isNull();
 		}
 	}
@@ -301,7 +301,7 @@ void unpackCommentIsAddedToEntryIdentifiedByASpec() throws IOException {
 		this.task.requiresUnpack((element) -> element.getName().endsWith("two.jar"));
 		executeTask();
 		try (JarFile jarFile = new JarFile(this.task.getArchiveFile().get().getAsFile())) {
-			assertThat(jarFile.getEntry(this.libPath + "two.jar").getComment()).startsWith("UNPACK:");
+			assertThat(jarFile.getEntry(this.libPath + "two.jar").getComment()).isEqualTo("UNPACK");
 			assertThat(jarFile.getEntry(this.libPath + "one.jar").getComment()).isNull();
 		}
 	}

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

@@ -159,7 +159,7 @@ JarAssert hasUnpackEntryWithNameStartingWith(String prefix) {
 					Optional<JarEntry> match = entries.filter((entry) -> entry.getName().startsWith(prefix))
 						.findFirst();
 					assertThat(match).as("Name starting with %s", prefix)
-						.hasValueSatisfying((entry) -> assertThat(entry.getComment()).startsWith("UNPACK:"));
+						.hasValueSatisfying((entry) -> assertThat(entry.getComment()).isEqualTo("UNPACK"));
 				});
 			});
 			return this;

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

@@ -345,7 +345,7 @@ void prepareStoredEntry(ZipArchiveEntry entry) {
 			entry.setCrc(this.crc.getValue());
 			entry.setMethod(ZipEntry.STORED);
 			if (this.unpack) {
-				entry.setComment("UNPACK:");
+				entry.setComment("UNPACK");
 			}
 		}
 

loader/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/AbstractPackagerTests.java

@@ -208,7 +208,7 @@ void libraries() throws Exception {
 		ZipEntry entry = getPackagedEntry("BOOT-INF/lib/" + libJarFile.getName());
 		assertThat(entry.getTime()).isEqualTo(JAN_1_1985);
 		entry = getPackagedEntry("BOOT-INF/lib/" + libJarFileToUnpack.getName());
-		assertThat(entry.getComment()).isEqualTo("UNPACK:");
+		assertThat(entry.getComment()).isEqualTo("UNPACK");
 	}
 
 	@Test
@@ -423,7 +423,7 @@ void unpackLibrariesTakePrecedenceOverExistingSourceEntries() throws Exception {
 		this.testJarFile.addClass("A.class", ClassWithMainMethod.class);
 		P packager = createPackager();
 		execute(packager, (callback) -> callback.library(newLibrary(nestedFile, LibraryScope.COMPILE, true)));
-		assertThat(getPackagedEntry(name).getComment()).startsWith("UNPACK:");
+		assertThat(getPackagedEntry(name).getComment()).isEqualTo("UNPACK");
 	}
 
 	@Test
@@ -538,7 +538,7 @@ void existingEntryThatMatchesUnpackLibraryIsMarkedForUnpack() throws IOException
 		assertThat(getPackagedEntryNames()).containsSubsequence("org/springframework/boot/loader/",
 				"WEB-INF/classes/com/example/Application.class", "WEB-INF/lib/" + library.getName());
 		ZipEntry unpackLibrary = getPackagedEntry("WEB-INF/lib/" + library.getName());
-		assertThat(unpackLibrary.getComment()).startsWith("UNPACK:");
+		assertThat(unpackLibrary.getComment()).isEqualTo("UNPACK");
 	}
 
 	@Test

loader/spring-boot-loader/src/main/java/org/springframework/boot/loader/launch/JarFileArchive.java

@@ -48,7 +48,7 @@
  */
 class JarFileArchive implements Archive {
 
-	private static final String UNPACK_MARKER = "UNPACK:";
+	private static final String UNPACK_MARKER = "UNPACK";
 
 	private static final FileAttribute<?>[] NO_FILE_ATTRIBUTES = {};
 

loader/spring-boot-loader/src/test/java/org/springframework/boot/loader/testsupport/TestJar.java

@@ -90,7 +90,7 @@ private static void writeNestedEntry(String name, boolean unpackNested, JarOutpu
 		nestedEntry.setSize(nestedJarData.length);
 		nestedEntry.setCompressedSize(nestedJarData.length);
 		if (unpackNested) {
-			nestedEntry.setComment("UNPACK:0000000000000000000000000000000000000000");
+			nestedEntry.setComment("UNPACK");
 		}
 		CRC32 crc32 = new CRC32();
 		crc32.update(nestedJarData);