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

Merge branch '2.0.x'

This commit is contained in:
Andy Wilkinson 2018-05-03 11:35:58 +01:00
parent 921c037956 f5fabbc1b9
commit 4ea7d3a767
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java
View File

@ -37,7 +37,7 @@ import org.gradle.api.tasks.bundling.Jar;
*/ */
public class BootJar extends Jar implements BootArchive { public class BootJar extends Jar implements BootArchive {
private BootArchiveSupport support = new BootArchiveSupport( private final BootArchiveSupport support = new BootArchiveSupport(
"org.springframework.boot.loader.JarLauncher", this::resolveZipCompression); "org.springframework.boot.loader.JarLauncher", this::resolveZipCompression);
private FileCollection classpath; private FileCollection classpath;
@ -48,10 +48,8 @@ public class BootJar extends Jar implements BootArchive {
* Creates a new {@code BootJar} task. * Creates a new {@code BootJar} task.
*/ */
public BootJar() { public BootJar() {
CopySpec bootInf = getRootSpec().addChildBeforeSpec(getMainSpec()) into("BOOT-INF/classes", classpathFiles(File::isDirectory));
.into("BOOT-INF"); into("BOOT-INF/lib", classpathFiles(File::isFile));
bootInf.into("classes", classpathFiles(File::isDirectory));
bootInf.into("lib", classpathFiles(File::isFile));
} }
private Action<CopySpec> classpathFiles(Spec<File> filter) { private Action<CopySpec> classpathFiles(Spec<File> filter) {