Handle missing manifest files in JarTypeFilter

This commit makes sure that a jar file without a manifest is handled properly (i.e. included in the repackaged archive). See gh-24597
spring-projects · Dec 23, 2020 · 86eecb0 · 86eecb0
1 parent e8a936d
commit 86eecb0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/.../spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/JarTypeFilter.java b/.../spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/JarTypeFilter.java
@@ -20,8 +20,10 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Optional;
 import java.util.Set;
 import java.util.jar.JarFile;
+import java.util.jar.Manifest;
 
 import org.apache.maven.artifact.Artifact;
 
@@ -43,8 +45,9 @@ class JarTypeFilter extends DependencyFilter {
 	@Override
 	protected boolean filter(Artifact artifact) {
 		try (JarFile jarFile = new JarFile(artifact.getFile())) {
-			String jarType = jarFile.getManifest().getMainAttributes().getValue("Spring-Boot-Jar-Type");
-			return jarType != null && EXCLUDED_JAR_TYPES.contains(jarType);
+			return Optional.ofNullable(jarFile.getManifest()).map(Manifest::getMainAttributes)
+					.map((attributes) -> attributes.getValue("Spring-Boot-Jar-Type")).map(EXCLUDED_JAR_TYPES::contains)
+					.orElse(Boolean.FALSE);
 		}
 		catch (IOException ex) {
 			return false;

diff --git a/...ng-boot-maven-plugin/src/test/java/org/springframework/boot/maven/JarTypeFilterTests.java b/...ng-boot-maven-plugin/src/test/java/org/springframework/boot/maven/JarTypeFilterTests.java
@@ -60,6 +60,11 @@ void whenArtifactHasAnnotationProcessorJarTypeThenItIsExcluded() {
 		assertThat(new JarTypeFilter().filter(createArtifact("annotation-processor"))).isTrue();
 	}
 
+	@Test
+	void whenArtifactHasNoManifestFileThenItIsIncluded() {
+		assertThat(new JarTypeFilter().filter(createArtifactWithNoManifest())).isFalse();
+	}
+
 	private Artifact createArtifact(String jarType) {
 		Path jarPath = this.temp.resolve("test.jar");
 		Manifest manifest = new Manifest();
@@ -78,4 +83,17 @@ private Artifact createArtifact(String jarType) {
 		return artifact;
 	}
 
+	private Artifact createArtifactWithNoManifest() {
+		Path jarPath = this.temp.resolve("test.jar");
+		try {
+			new JarOutputStream(new FileOutputStream(jarPath.toFile())).close();
+		}
+		catch (IOException ex) {
+			throw new RuntimeException(ex);
+		}
+		Artifact artifact = mock(Artifact.class);
+		given(artifact.getFile()).willReturn(jarPath.toFile());
+		return artifact;
+	}
+
 }