From b81fff3d1908673a6a46b95bf7947d2ffe92d548 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 31 Oct 2023 16:10:53 -0700 Subject: [PATCH] Minor cleanup --- src/main/java/rife/bld/extension/BootJarOperation.java | 4 ++-- src/main/java/rife/bld/extension/BootWarOperation.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/rife/bld/extension/BootJarOperation.java b/src/main/java/rife/bld/extension/BootJarOperation.java index fd61e28..4fe50c5 100644 --- a/src/main/java/rife/bld/extension/BootJarOperation.java +++ b/src/main/java/rife/bld/extension/BootJarOperation.java @@ -79,15 +79,15 @@ public class BootJarOperation extends AbstractBootOperation { * @param project the project * @return this operation instance */ + @Override public BootJarOperation fromProject(Project project) throws IOException { - mainClass(project.mainClass()); - return destinationDirectory(project.buildDistDirectory()) .destinationFileName(project.archiveBaseName() + "-" + project.version() + "-boot.jar") .infLibs(project.compileClasspathJars()) .infLibs(project.runtimeClasspathJars()) .launcherClass("org.springframework.boot.loader.JarLauncher") .launcherLibs(project.standaloneClasspathJars()) + .mainClass(project.mainClass()) .manifestAttributes( List.of( new BootManifestAttribute("Manifest-Version", "1.0"), diff --git a/src/main/java/rife/bld/extension/BootWarOperation.java b/src/main/java/rife/bld/extension/BootWarOperation.java index 6390bf6..2199aa7 100644 --- a/src/main/java/rife/bld/extension/BootWarOperation.java +++ b/src/main/java/rife/bld/extension/BootWarOperation.java @@ -97,12 +97,11 @@ public class BootWarOperation extends AbstractBootOperation { /** * Configures the operation from a {@link Project}. * - * @param project the project to configure the operation from + * @param project the project * @return this operation instance */ + @Override public BootWarOperation fromProject(Project project) throws IOException { - mainClass(project.mainClass()); - return destinationDirectory(project.buildDistDirectory()) .destinationFileName(project.archiveBaseName() + "-" + project.version() + "-boot.war") .infLibs(project.compileClasspathJars()) @@ -111,6 +110,7 @@ public class BootWarOperation extends AbstractBootOperation { // TODO add provided libs .launcherClass("org.springframework.boot.loader.WarLauncher") .launcherLibs(project.standaloneClasspathJars()) + .mainClass(project.mainClass()) .manifestAttributes( List.of( new BootManifestAttribute("Manifest-Version", "1.0"),