diff --git a/src/main/java/rife/bld/extension/AbstractBootOperation.java b/src/main/java/rife/bld/extension/AbstractBootOperation.java index 743f882..f91a639 100644 --- a/src/main/java/rife/bld/extension/AbstractBootOperation.java +++ b/src/main/java/rife/bld/extension/AbstractBootOperation.java @@ -16,7 +16,6 @@ package rife.bld.extension; -import rife.bld.Project; import rife.bld.operations.AbstractOperation; import rife.tools.FileUtils; import rife.tools.exceptions.FileUtilsErrorException; @@ -265,14 +264,6 @@ public abstract class AbstractBootOperation> } } - /** - * Configures the operation from a {@link Project}. - * - * @param project the project - * @return this operation instance - */ - public abstract T fromProject(Project project) throws IOException; - /** * Provides the libraries that will be stored in {@code BOOT-INF} or {@code WEB-INF}. * diff --git a/src/main/java/rife/bld/extension/BootJarOperation.java b/src/main/java/rife/bld/extension/BootJarOperation.java index 4fe50c5..fd61e28 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 2199aa7..6390bf6 100644 --- a/src/main/java/rife/bld/extension/BootWarOperation.java +++ b/src/main/java/rife/bld/extension/BootWarOperation.java @@ -97,11 +97,12 @@ public class BootWarOperation extends AbstractBootOperation { /** * Configures the operation from a {@link Project}. * - * @param project the project + * @param project the project to configure the operation from * @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()) @@ -110,7 +111,6 @@ 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"),