From 548fa95b799335a0821a4d142662f646dbed9b99 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 22 Jun 2024 11:03:53 -0700 Subject: [PATCH] Version 0.9.6-SNAPSHOT Minor code cleanups --- src/bld/java/rife/bld/extension/SpringBootBuild.java | 4 ++-- src/main/java/rife/bld/extension/BootUtils.java | 2 -- src/main/java/rife/bld/extension/BootWarOperation.java | 1 + .../java/rife/bld/extension/BootJarOperationTest.java | 10 +++++----- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index 90598cf..d38f1df 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -33,10 +33,10 @@ public class SpringBootBuild extends Project { public SpringBootBuild() { pkg = "rife.bld.extension"; name = "bld-spring-boot"; - version = version(0, 9, 5); + version = version(0, 9, 6, "SNAPSHOT"); javaRelease = 17; - + downloadSources = true; autoDownloadPurge = true; diff --git a/src/main/java/rife/bld/extension/BootUtils.java b/src/main/java/rife/bld/extension/BootUtils.java index ca58e2a..c45138c 100644 --- a/src/main/java/rife/bld/extension/BootUtils.java +++ b/src/main/java/rife/bld/extension/BootUtils.java @@ -17,8 +17,6 @@ package rife.bld.extension; import rife.bld.Project; -import rife.tools.FileUtils; -import rife.tools.exceptions.FileUtilsErrorException; import java.io.File; import java.io.IOException; diff --git a/src/main/java/rife/bld/extension/BootWarOperation.java b/src/main/java/rife/bld/extension/BootWarOperation.java index 9362df4..da4bd53 100644 --- a/src/main/java/rife/bld/extension/BootWarOperation.java +++ b/src/main/java/rife/bld/extension/BootWarOperation.java @@ -139,6 +139,7 @@ public class BootWarOperation extends AbstractBootOperation { .providedLibs(project.providedClasspathJars()) .sourceDirectories(project.buildMainDirectory(), project.srcMainResourcesDirectory()); } + /** * Provides libraries that will be used for the WAR creation in {@code /WEB-INF/lib-provided}. * diff --git a/src/test/java/rife/bld/extension/BootJarOperationTest.java b/src/test/java/rife/bld/extension/BootJarOperationTest.java index c5d5508..20429c6 100644 --- a/src/test/java/rife/bld/extension/BootJarOperationTest.java +++ b/src/test/java/rife/bld/extension/BootJarOperationTest.java @@ -24,7 +24,6 @@ import rife.tools.FileUtils; import java.io.File; import java.io.IOException; import java.nio.file.Files; -import java.nio.file.Path; import java.util.Enumeration; import java.util.List; import java.util.jar.JarEntry; @@ -277,10 +276,12 @@ class BootJarOperationTest { void testProject() throws IOException { var tmp_dir = Files.createTempDirectory("bootprjtmp").toFile(); 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.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().get("Manifest-Version")).as("Manifest-Version").isEqualTo("1.0"); assertThat(bootJar.manifestAttributes().get("Main-Class")).as("Main-Class").endsWith("JarLauncher"); @@ -288,8 +289,7 @@ class BootJarOperationTest { assertThat(bootJar.manifestAttribute("Manifest-Test", "tsst") .manifestAttributes().get("Manifest-Test")).as("Manifest-Test").isEqualTo("tsst"); assertThat(bootJar.destinationDirectory()).as("destinationDirectory").isDirectory(); - assertThat(bootJar.destinationDirectory().getAbsolutePath()).as("destinationDirectory") - .isEqualTo(Path.of(tmp_dir.getPath(), "build", "dist").toString()); + assertThat(bootJar.destinationDirectory()).isEqualTo(project.buildDistDirectory()); assertThat(bootJar.infLibs()).as("infoLibs").isEmpty(); assertThat(bootJar.launcherLibs()).as("launcherJars").isEmpty(); assertThat(bootJar.destinationFileName()).isEqualTo("test_project-0.0.1-boot.jar");