Compare commits

..

No commits in common. "b81fff3d1908673a6a46b95bf7947d2ffe92d548" and "bd9b44a7826ec7c22e29db5ea6c58eb12cff5db0" have entirely different histories.

3 changed files with 5 additions and 14 deletions

View file

@ -16,7 +16,6 @@
package rife.bld.extension; package rife.bld.extension;
import rife.bld.Project;
import rife.bld.operations.AbstractOperation; import rife.bld.operations.AbstractOperation;
import rife.tools.FileUtils; import rife.tools.FileUtils;
import rife.tools.exceptions.FileUtilsErrorException; import rife.tools.exceptions.FileUtilsErrorException;
@ -265,14 +264,6 @@ public abstract class AbstractBootOperation<T extends AbstractBootOperation<T>>
} }
} }
/**
* 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}. * Provides the libraries that will be stored in {@code BOOT-INF} or {@code WEB-INF}.
* *

View file

@ -79,15 +79,15 @@ public class BootJarOperation extends AbstractBootOperation<BootJarOperation> {
* @param project the project * @param project the project
* @return this operation instance * @return this operation instance
*/ */
@Override
public BootJarOperation fromProject(Project project) throws IOException { public BootJarOperation fromProject(Project project) throws IOException {
mainClass(project.mainClass());
return destinationDirectory(project.buildDistDirectory()) return destinationDirectory(project.buildDistDirectory())
.destinationFileName(project.archiveBaseName() + "-" + project.version() + "-boot.jar") .destinationFileName(project.archiveBaseName() + "-" + project.version() + "-boot.jar")
.infLibs(project.compileClasspathJars()) .infLibs(project.compileClasspathJars())
.infLibs(project.runtimeClasspathJars()) .infLibs(project.runtimeClasspathJars())
.launcherClass("org.springframework.boot.loader.JarLauncher") .launcherClass("org.springframework.boot.loader.JarLauncher")
.launcherLibs(project.standaloneClasspathJars()) .launcherLibs(project.standaloneClasspathJars())
.mainClass(project.mainClass())
.manifestAttributes( .manifestAttributes(
List.of( List.of(
new BootManifestAttribute("Manifest-Version", "1.0"), new BootManifestAttribute("Manifest-Version", "1.0"),

View file

@ -97,11 +97,12 @@ public class BootWarOperation extends AbstractBootOperation<BootWarOperation> {
/** /**
* Configures the operation from a {@link Project}. * Configures the operation from a {@link Project}.
* *
* @param project the project * @param project the project to configure the operation from
* @return this operation instance * @return this operation instance
*/ */
@Override
public BootWarOperation fromProject(Project project) throws IOException { public BootWarOperation fromProject(Project project) throws IOException {
mainClass(project.mainClass());
return destinationDirectory(project.buildDistDirectory()) return destinationDirectory(project.buildDistDirectory())
.destinationFileName(project.archiveBaseName() + "-" + project.version() + "-boot.war") .destinationFileName(project.archiveBaseName() + "-" + project.version() + "-boot.war")
.infLibs(project.compileClasspathJars()) .infLibs(project.compileClasspathJars())
@ -110,7 +111,6 @@ public class BootWarOperation extends AbstractBootOperation<BootWarOperation> {
// TODO add provided libs // TODO add provided libs
.launcherClass("org.springframework.boot.loader.WarLauncher") .launcherClass("org.springframework.boot.loader.WarLauncher")
.launcherLibs(project.standaloneClasspathJars()) .launcherLibs(project.standaloneClasspathJars())
.mainClass(project.mainClass())
.manifestAttributes( .manifestAttributes(
List.of( List.of(
new BootManifestAttribute("Manifest-Version", "1.0"), new BootManifestAttribute("Manifest-Version", "1.0"),