diff --git a/build-plugin/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootZipCopyAction.java b/build-plugin/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootZipCopyAction.java index 0493313af51..3f7f1088da6 100644 --- a/build-plugin/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootZipCopyAction.java +++ b/build-plugin/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootZipCopyAction.java @@ -610,7 +610,7 @@ class BootZipCopyAction implements CopyAction { entry.setCrc(this.crc.getValue()); entry.setMethod(ZipEntry.STORED); if (this.unpack) { - entry.setComment("UNPACK:"); + entry.setComment("UNPACK"); } } diff --git a/build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PackagingDocumentationTests.java b/build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PackagingDocumentationTests.java index e9573acb853..5cfb93fc620 100644 --- a/build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PackagingDocumentationTests.java +++ b/build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PackagingDocumentationTests.java @@ -124,7 +124,7 @@ class PackagingDocumentationTests { 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"); } } diff --git a/build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveTests.java b/build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveTests.java index a369f0b4667..d9cc6f6bc52 100644 --- a/build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveTests.java +++ b/build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveTests.java @@ -289,7 +289,7 @@ abstract class AbstractBootArchiveTests { 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 @@ abstract class AbstractBootArchiveTests { 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(); } } diff --git a/build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/AbstractArchiveIntegrationTests.java b/build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/AbstractArchiveIntegrationTests.java index 7701ba4099f..86eb7acaa88 100644 --- a/build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/AbstractArchiveIntegrationTests.java +++ b/build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/AbstractArchiveIntegrationTests.java @@ -159,7 +159,7 @@ abstract class AbstractArchiveIntegrationTests { Optional 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; diff --git a/loader/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/AbstractJarWriter.java b/loader/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/AbstractJarWriter.java index 31be485310f..afd3efbc774 100644 --- a/loader/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/AbstractJarWriter.java +++ b/loader/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/AbstractJarWriter.java @@ -345,7 +345,7 @@ public abstract class AbstractJarWriter implements LoaderClassesWriter { entry.setCrc(this.crc.getValue()); entry.setMethod(ZipEntry.STORED); if (this.unpack) { - entry.setComment("UNPACK:"); + entry.setComment("UNPACK"); } } diff --git a/loader/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/AbstractPackagerTests.java b/loader/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/AbstractPackagerTests.java index 0661e2b2abd..0c2fbbf228d 100644 --- a/loader/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/AbstractPackagerTests.java +++ b/loader/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/AbstractPackagerTests.java @@ -208,7 +208,7 @@ abstract class AbstractPackagerTests

{ 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 @@ abstract class AbstractPackagerTests

{ 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 @@ abstract class AbstractPackagerTests

{ 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 diff --git a/loader/spring-boot-loader/src/main/java/org/springframework/boot/loader/launch/JarFileArchive.java b/loader/spring-boot-loader/src/main/java/org/springframework/boot/loader/launch/JarFileArchive.java index 58af59cc655..a9530ab588c 100755 --- a/loader/spring-boot-loader/src/main/java/org/springframework/boot/loader/launch/JarFileArchive.java +++ b/loader/spring-boot-loader/src/main/java/org/springframework/boot/loader/launch/JarFileArchive.java @@ -48,7 +48,7 @@ import org.springframework.boot.loader.net.protocol.jar.JarUrl; */ 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 = {}; diff --git a/loader/spring-boot-loader/src/test/java/org/springframework/boot/loader/testsupport/TestJar.java b/loader/spring-boot-loader/src/test/java/org/springframework/boot/loader/testsupport/TestJar.java index bcaef037ab2..d655ae62f6f 100644 --- a/loader/spring-boot-loader/src/test/java/org/springframework/boot/loader/testsupport/TestJar.java +++ b/loader/spring-boot-loader/src/test/java/org/springframework/boot/loader/testsupport/TestJar.java @@ -90,7 +90,7 @@ public abstract class TestJar { nestedEntry.setSize(nestedJarData.length); nestedEntry.setCompressedSize(nestedJarData.length); if (unpackNested) { - nestedEntry.setComment("UNPACK:0000000000000000000000000000000000000000"); + nestedEntry.setComment("UNPACK"); } CRC32 crc32 = new CRC32(); crc32.update(nestedJarData);