From c7e6248772e80d7fa1d4596a3d728858a9e27c94 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 20 Jun 2024 20:23:47 -0700 Subject: [PATCH 1/4] Do not delete resources/templates directories after copying class files. Fixes #2 --- .../rife/bld/extension/AbstractBootOperation.java | 4 +--- src/main/java/rife/bld/extension/BootUtils.java | 14 -------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/main/java/rife/bld/extension/AbstractBootOperation.java b/src/main/java/rife/bld/extension/AbstractBootOperation.java index a485812..abde1ca 100644 --- a/src/main/java/rife/bld/extension/AbstractBootOperation.java +++ b/src/main/java/rife/bld/extension/AbstractBootOperation.java @@ -144,15 +144,13 @@ public abstract class AbstractBootOperation> var inf_classes_dir = new File(stagingInfDirectory, "classes"); BootUtils.mkDirs(inf_classes_dir); - for (var dir : sourceDirectories()) { + for (var dir : sourceDirectories_) { if (dir.exists()) { FileUtils.copyDirectory(dir, inf_classes_dir); } else if (LOGGER.isLoggable(Level.WARNING)) { LOGGER.warning("Directory not found: " + dir.getAbsolutePath()); } } - - BootUtils.deleteDirectories(new File(inf_classes_dir, "resources"), new File(inf_classes_dir, "templates")); } /** diff --git a/src/main/java/rife/bld/extension/BootUtils.java b/src/main/java/rife/bld/extension/BootUtils.java index dfdfee9..ca58e2a 100644 --- a/src/main/java/rife/bld/extension/BootUtils.java +++ b/src/main/java/rife/bld/extension/BootUtils.java @@ -38,20 +38,6 @@ public final class BootUtils { // no-op } - /** - * Deletes the given directories. - * - * @param directories one or more directories to delete - * @throws FileUtilsErrorException if an error occurs - */ - public static void deleteDirectories(File... directories) throws FileUtilsErrorException { - for (var d : directories) { - if (d.exists()) { - FileUtils.deleteDirectory(d); - } - } - } - /** * Calculates the given file size in bytes, kilobytes, megabytes, gigabytes or terabytes. * From 2e766c91bf791a0e2d9bce6e9b93cea25c508c5e Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 22 Jun 2024 11:03:53 -0700 Subject: [PATCH 2/4] 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"); From b03468e4d9f9521c902765da0e04b7ab5802600f Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 22 Jun 2024 15:37:01 -0700 Subject: [PATCH 3/4] Bumped PMD extension to version 1.1.0 --- lib/bld/bld-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index e317c92..771874f 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,7 +1,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= -bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.0.1 +bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.0 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_RELEASES bld.sourceDirectories= bld.version=1.9.1 From dc7270faf694ebd39ab1fb8a4a38f6861c73c164 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 22 Jun 2024 15:39:22 -0700 Subject: [PATCH 4/4] Version 0.9.6 --- examples/lib/bld/bld-wrapper.properties | 2 +- src/bld/java/rife/bld/extension/SpringBootBuild.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties index aba8240..7f12acf 100644 --- a/examples/lib/bld/bld-wrapper.properties +++ b/examples/lib/bld/bld-wrapper.properties @@ -1,7 +1,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= -bld.extension-boot=com.uwyn.rife2:bld-spring-boot:0.9.5 +bld.extension-boot=com.uwyn.rife2:bld-spring-boot:0.9.6 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.sourceDirectories= bld.version=1.9.1 diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index d38f1df..26f0614 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -33,7 +33,7 @@ public class SpringBootBuild extends Project { public SpringBootBuild() { pkg = "rife.bld.extension"; name = "bld-spring-boot"; - version = version(0, 9, 6, "SNAPSHOT"); + version = version(0, 9, 6); javaRelease = 17;