diff --git a/README.md b/README.md index a8e15b7..5eaebdb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [bld](https://rife2.com/bld) Extension to Help Create [Spring Boot](https://spring.io/projects/spring-boot) Web Applications +# [bld](https://rife2.com/bld) Extension to Help Create [Spring Boot](https://spring.io/projects/spring-boot) Web Applications [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) diff --git a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java index 295cbc5..fb06087 100644 --- a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java +++ b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java @@ -40,7 +40,11 @@ public class DemoApplicationBuild extends WebProject { public static void main(String[] args) { var logger = Logger.getLogger("rife.bld.extension"); - logger.setLevel(Level.FINER); + ConsoleHandler consoleHandler = new ConsoleHandler(); + consoleHandler.setLevel(Level.ALL); + logger.addHandler(consoleHandler); + logger.setLevel(Level.ALL); + logger.setUseParentHandlers(false); new DemoApplicationBuild().start(args); } diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index 8bfb303..d0c6a32 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -24,7 +24,8 @@ import rife.bld.publish.PublishScm; import java.util.List; -import static rife.bld.dependencies.Repository.*; +import static rife.bld.dependencies.Repository.MAVEN_CENTRAL; +import static rife.bld.dependencies.Repository.RIFE2_RELEASES; import static rife.bld.dependencies.Scope.compile; import static rife.bld.dependencies.Scope.test; import static rife.bld.operations.JavadocOptions.DocLinkOption.NO_MISSING; diff --git a/src/main/java/rife/bld/extension/AbstractBootOperation.java b/src/main/java/rife/bld/extension/AbstractBootOperation.java index 6fb1367..d486f4c 100644 --- a/src/main/java/rife/bld/extension/AbstractBootOperation.java +++ b/src/main/java/rife/bld/extension/AbstractBootOperation.java @@ -174,8 +174,9 @@ public abstract class AbstractBootOperation> * Part of the {@link #execute} operation, create the archive from the staging directory. * * @param stagingDirectory the staging directory + * @return the archive */ - protected void executeCreateArchive(File stagingDirectory) + protected File executeCreateArchive(File stagingDirectory) throws IOException { executeCreateManifest(stagingDirectory); if (LOGGER.isLoggable(Level.FINE) && (!silent())) { @@ -199,9 +200,9 @@ public abstract class AbstractBootOperation> args = "-0cMf"; } - jarTool.run(stdout, stderr, args, - new File(destinationDirectory(), destinationFileName()).getAbsolutePath(), - "-C", stagingDirectory.getAbsolutePath(), "."); + var archive = new File(destinationDirectory(), destinationFileName()); + + jarTool.run(stdout, stderr, args, archive.getAbsolutePath(), "-C", stagingDirectory.getAbsolutePath(), "."); var errBuff = err.getBuffer(); if (!errBuff.isEmpty()) { @@ -212,6 +213,8 @@ public abstract class AbstractBootOperation> LOGGER.info(outBuff.toString()); } } + + return archive; } /** diff --git a/src/main/java/rife/bld/extension/BootJarOperation.java b/src/main/java/rife/bld/extension/BootJarOperation.java index 6e2f187..ae5aed7 100644 --- a/src/main/java/rife/bld/extension/BootJarOperation.java +++ b/src/main/java/rife/bld/extension/BootJarOperation.java @@ -50,11 +50,10 @@ public class BootJarOperation extends AbstractBootOperation { executeCopyInfLibs(boot_inf_dir); executeCopyBootLoader(staging_dir); - executeCreateArchive(staging_dir); + var archive = executeCreateArchive(staging_dir); if (!silent() && LOGGER.isLoggable(Level.INFO)) { - LOGGER.info(String.format("The executable JAR (%s) was created in: %s%n", destinationFileName(), - destinationDirectory())); + LOGGER.info("The executable JAR was created: " + archive.getAbsolutePath()); } } finally { FileUtils.deleteDirectory(staging_dir); diff --git a/src/main/java/rife/bld/extension/BootWarOperation.java b/src/main/java/rife/bld/extension/BootWarOperation.java index 41cd004..1a73de0 100644 --- a/src/main/java/rife/bld/extension/BootWarOperation.java +++ b/src/main/java/rife/bld/extension/BootWarOperation.java @@ -54,11 +54,10 @@ public class BootWarOperation extends AbstractBootOperation { executeCopyWebInfProvidedLib(web_inf_dir); executeCopyBootLoader(staging_dir); - executeCreateArchive(staging_dir); + var archive = executeCreateArchive(staging_dir); if (!silent() && LOGGER.isLoggable(Level.INFO)) { - LOGGER.info(String.format("The executable WAR (%s) was created in: %s%n", destinationFileName(), - destinationDirectory())); + LOGGER.info("The executable WAR was created: " + archive.getAbsolutePath()); } } finally { FileUtils.deleteDirectory(staging_dir);