From f39b044cf78b84077dcf205cc205f48804480ae6 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 2 Dec 2013 14:10:56 +0000 Subject: [PATCH] Fix packaging for Layout.NONE Fixes gh-139 --- .../org/springframework/boot/loader/tools/Repackager.java | 4 +++- .../springframework/boot/loader/tools/RepackagerTests.java | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java index d243db39d2..3cdcf63b02 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java @@ -145,7 +145,9 @@ public class Repackager { } } }); - writer.writeLoaderClasses(); + if (!(this.layout instanceof Layouts.None)) { + writer.writeLoaderClasses(); + } } finally { try { diff --git a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java index c2c4c9885e..ee632ecabe 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java @@ -148,6 +148,7 @@ public class RepackagerTests { Manifest actualManifest = getManifest(file); assertThat(actualManifest.getMainAttributes().getValue("Main-Class"), equalTo("a.b.C")); + assertThat(hasLauncherClasses(file), equalTo(false)); } @Test @@ -160,6 +161,7 @@ public class RepackagerTests { Manifest actualManifest = getManifest(file); assertThat(actualManifest.getMainAttributes().getValue("Main-Class"), equalTo(null)); + assertThat(hasLauncherClasses(file), equalTo(false)); } @Test