rife2/bld-spring-boot
rife2/bld-spring-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor code cleanup

Browse source
This commit is contained in:
Erik C. Thauvin 2023-11-04 13:19:15 -07:00
parent 219645e2c4
commit 3e3d6dafec
6 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/rife/bld/extension/BootWarOperation.java
View file

@ -107,7 +107,6 @@ public class BootWarOperation extends AbstractBootOperation<BootWarOperation> {
.infLibs(project.compileClasspathJars())
.infLibs(project.runtimeClasspathJars())
.infLibs(project.buildDistDirectory())
// TODO add provided libs
.launcherClass("org.springframework.boot.loader.WarLauncher")
.launcherLibs(project.standaloneClasspathJars())
.mainClass(project.mainClass())
@ -116,6 +115,7 @@ public class BootWarOperation extends AbstractBootOperation<BootWarOperation> {
new BootManifestAttribute("Main-Class", launcherClass()),
new BootManifestAttribute("Start-Class", mainClass())
))
.providedLibs(project.providedClasspathJars())
.sourceDirectories(project.buildMainDirectory(), project.srcMainResourcesDirectory());
}
@ -133,11 +133,11 @@ public class BootWarOperation extends AbstractBootOperation<BootWarOperation> {
/**
* Provides the libraries that will be used for the WAR creation in {@code /WEB-INF/lib-provided}.
*
* @param jar one or more Java archive file
* @param jars one or more Java archive files
* @return this operation instance
*/
public BootWarOperation providedLibs(File... jar) {
providedLibs_.addAll(List.of(jar));
public BootWarOperation providedLibs(File... jars) {
providedLibs_.addAll(List.of(jars));
return this;
}
}