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

Fixed provided libs directory creation

Browse source
This commit is contained in:
Erik C. Thauvin 2023-10-30 15:06:45 -07:00
parent 9260fa5068
commit c05c1192a6
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,7 +54,7 @@ public class BootWarOperation extends AbstractBootOperation<BootWarOperation> {
executeCopyWebInfProvidedLib(web_inf_dir); executeCopyWebInfProvidedLib(web_inf_dir);
executeCopyBootLoader(staging_dir); executeCopyBootLoader(staging_dir);
executeCreateArchive(staging_dir, LOGGER); executeCreateArchive(staging_dir);
if (!silent() && LOGGER.isLoggable(Level.INFO)) { if (!silent() && LOGGER.isLoggable(Level.INFO)) {
LOGGER.info(String.format("The executable WAR (%s) was created in: %s%n", destinationFileName(), LOGGER.info(String.format("The executable WAR (%s) was created in: %s%n", destinationFileName(),
@ -66,16 +66,15 @@ public class BootWarOperation extends AbstractBootOperation<BootWarOperation> {
} }
/** /**
* Part of the {@link #execute} operation, copy the {@code BOOT-INF} libs. * Part of the {@link #execute} operation, copy the {@code WEB-INF/lib-provided} libs.
* *
* @param stagingBootInfDirectory the staging {@code BOOT-INF} directory * @param stagingWebInfDirectory the staging {@code WEB-INF/lib-provided} directory
*/ */
protected void executeCopyWebInfProvidedLib(File stagingBootInfDirectory) throws IOException { protected void executeCopyWebInfProvidedLib(File stagingWebInfDirectory) throws IOException {
var boot_inf_lib_dir = new File(stagingBootInfDirectory, "lib"); var lib_provided_dir = new File(stagingWebInfDirectory, "lib-provided");
mkDirs(boot_inf_lib_dir); mkDirs(lib_provided_dir);
for (var jar : providedLibs_) { for (var jar : providedLibs_) {
Files.copy(jar.toPath(), boot_inf_lib_dir.toPath().resolve(jar.getName()));
if (jar.exists()) { if (jar.exists()) {
Files.copy(jar.toPath(), lib_provided_dir.toPath().resolve(jar.getName())); Files.copy(jar.toPath(), lib_provided_dir.toPath().resolve(jar.getName()));
} else if (LOGGER.isLoggable(Level.WARNING)) { } else if (LOGGER.isLoggable(Level.WARNING)) {

3
src/test/java/rife/bld/extension/BootJarOperationTest.java
View file

@ -283,7 +283,8 @@ class BootJarOperationTest {
"WEB-INF/lib/" + BLD + '\n' + "WEB-INF/lib/" + BLD + '\n' +
"WEB-INF/lib/dist/\n" + "WEB-INF/lib/dist/\n" +
"WEB-INF/lib/" + SPRING_BOOT + '\n' + "WEB-INF/lib/" + SPRING_BOOT + '\n' +
"WEB-INF/lib/" + SPRING_BOOT_ACTUATOR + '\n' + LAUNCHER_JARS); "WEB-INF/lib/" + SPRING_BOOT_ACTUATOR + '\n' +
"WEB-INF/lib-provided/\n" + LAUNCHER_JARS);
FileUtils.deleteDirectory(tmp_dir); FileUtils.deleteDirectory(tmp_dir);
} }