Merge branch '2.0.x'
This commit is contained in:
commit
76849c12e5
|
@ -66,10 +66,11 @@ final class ApplicationPluginAction implements PluginApplicationAction {
|
||||||
.fromString(loadResource("/windowsStartScript.txt")));
|
.fromString(loadResource("/windowsStartScript.txt")));
|
||||||
project.getConfigurations().all((configuration) -> {
|
project.getConfigurations().all((configuration) -> {
|
||||||
if ("bootArchives".equals(configuration.getName())) {
|
if ("bootArchives".equals(configuration.getName())) {
|
||||||
distribution.getContents()
|
CopySpec libCopySpec = project.copySpec().into("lib")
|
||||||
.with(project.copySpec().into("lib")
|
|
||||||
.from((Callable<FileCollection>) () -> configuration
|
.from((Callable<FileCollection>) () -> configuration
|
||||||
.getArtifacts().getFiles()));
|
.getArtifacts().getFiles());
|
||||||
|
libCopySpec.setFileMode(0644);
|
||||||
|
distribution.getContents().with(libCopySpec);
|
||||||
bootStartScripts.setClasspath(configuration.getArtifacts().getFiles());
|
bootStartScripts.setClasspath(configuration.getArtifacts().getFiles());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue