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

Version 0.9.6-SNAPSHOT

Browse source 
Minor code cleanups
This commit is contained in:
Erik C. Thauvin 2024-06-22 11:03:53 -07:00
parent c7e6248772
commit 2e766c91bf
Signed by: erik
GPG key ID: 776702A6A2DA330E
4 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/bld/java/rife/bld/extension/SpringBootBuild.java
View file

@ -33,7 +33,7 @@ public class SpringBootBuild extends Project {
public SpringBootBuild() { public SpringBootBuild() {
pkg = "rife.bld.extension"; pkg = "rife.bld.extension";
name = "bld-spring-boot"; name = "bld-spring-boot";
version = version(0, 9, 5); version = version(0, 9, 6, "SNAPSHOT");
javaRelease = 17; javaRelease = 17;

2
src/main/java/rife/bld/extension/BootUtils.java
View file

@ -17,8 +17,6 @@
package rife.bld.extension; package rife.bld.extension;
import rife.bld.Project; import rife.bld.Project;
import rife.tools.FileUtils;
import rife.tools.exceptions.FileUtilsErrorException;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;

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

@ -139,6 +139,7 @@ public class BootWarOperation extends AbstractBootOperation<BootWarOperation> {
.providedLibs(project.providedClasspathJars()) .providedLibs(project.providedClasspathJars())
.sourceDirectories(project.buildMainDirectory(), project.srcMainResourcesDirectory()); .sourceDirectories(project.buildMainDirectory(), project.srcMainResourcesDirectory());
} }
/** /**
* Provides libraries that will be used for the WAR creation in {@code /WEB-INF/lib-provided}. * Provides libraries that will be used for the WAR creation in {@code /WEB-INF/lib-provided}.
* *

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

@ -24,7 +24,6 @@ import rife.tools.FileUtils;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.List; import java.util.List;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
@ -277,10 +276,12 @@ class BootJarOperationTest {
void testProject() throws IOException { void testProject() throws IOException {
var tmp_dir = Files.createTempDirectory("bootprjtmp").toFile(); var tmp_dir = Files.createTempDirectory("bootprjtmp").toFile();
var project = new CustomProject(tmp_dir); var project = new CustomProject(tmp_dir);
var bootJar = new BootJarOperation().fromProject(project); var bootJar = new BootJarOperation().fromProject(project).sourceDirectories("src/main/java");
assertThat(bootJar.mainClass()).as("mainClass").isEqualTo(MAIN_CLASS); assertThat(bootJar.mainClass()).as("mainClass").isEqualTo(MAIN_CLASS);
assertThat(bootJar.sourceDirectories()).as("sourceDirectories.size").hasSize(2); assertThat(bootJar.sourceDirectories()).as("sourceDirectories.size").hasSize(3)
.containsExactly(project.buildMainDirectory(), project.srcMainResourcesDirectory(),
new File("src/main/java"));
assertThat(bootJar.manifestAttributes()).as("manifestAttributes.size").hasSize(3); assertThat(bootJar.manifestAttributes()).as("manifestAttributes.size").hasSize(3);
assertThat(bootJar.manifestAttributes().get("Manifest-Version")).as("Manifest-Version").isEqualTo("1.0"); assertThat(bootJar.manifestAttributes().get("Manifest-Version")).as("Manifest-Version").isEqualTo("1.0");
assertThat(bootJar.manifestAttributes().get("Main-Class")).as("Main-Class").endsWith("JarLauncher"); assertThat(bootJar.manifestAttributes().get("Main-Class")).as("Main-Class").endsWith("JarLauncher");
@ -288,8 +289,7 @@ class BootJarOperationTest {
assertThat(bootJar.manifestAttribute("Manifest-Test", "tsst") assertThat(bootJar.manifestAttribute("Manifest-Test", "tsst")
.manifestAttributes().get("Manifest-Test")).as("Manifest-Test").isEqualTo("tsst"); .manifestAttributes().get("Manifest-Test")).as("Manifest-Test").isEqualTo("tsst");
assertThat(bootJar.destinationDirectory()).as("destinationDirectory").isDirectory(); assertThat(bootJar.destinationDirectory()).as("destinationDirectory").isDirectory();
assertThat(bootJar.destinationDirectory().getAbsolutePath()).as("destinationDirectory") assertThat(bootJar.destinationDirectory()).isEqualTo(project.buildDistDirectory());
.isEqualTo(Path.of(tmp_dir.getPath(), "build", "dist").toString());
assertThat(bootJar.infLibs()).as("infoLibs").isEmpty(); assertThat(bootJar.infLibs()).as("infoLibs").isEmpty();
assertThat(bootJar.launcherLibs()).as("launcherJars").isEmpty(); assertThat(bootJar.launcherLibs()).as("launcherJars").isEmpty();
assertThat(bootJar.destinationFileName()).isEqualTo("test_project-0.0.1-boot.jar"); assertThat(bootJar.destinationFileName()).isEqualTo("test_project-0.0.1-boot.jar");