root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Fix packaging for Layout.NONE 

Fixes gh-139
This commit is contained in:
Dave Syer 2013-12-02 14:10:56 +00:00
parent 40bfd295eb
commit f39b044cf7
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
View File

@ -145,7 +145,9 @@ public class Repackager {
} }
} }
}); });
writer.writeLoaderClasses(); if (!(this.layout instanceof Layouts.None)) {
writer.writeLoaderClasses();
}
} }
finally { finally {
try { try {

2
spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java
View File

@ -148,6 +148,7 @@ public class RepackagerTests {
Manifest actualManifest = getManifest(file); Manifest actualManifest = getManifest(file);
assertThat(actualManifest.getMainAttributes().getValue("Main-Class"), assertThat(actualManifest.getMainAttributes().getValue("Main-Class"),
equalTo("a.b.C")); equalTo("a.b.C"));
assertThat(hasLauncherClasses(file), equalTo(false));
} }
@Test @Test
@ -160,6 +161,7 @@ public class RepackagerTests {
Manifest actualManifest = getManifest(file); Manifest actualManifest = getManifest(file);
assertThat(actualManifest.getMainAttributes().getValue("Main-Class"), assertThat(actualManifest.getMainAttributes().getValue("Main-Class"),
equalTo(null)); equalTo(null));
assertThat(hasLauncherClasses(file), equalTo(false));
} }
@Test @Test