diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties index 7f12acf..aba8240 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.6 +bld.extension-boot=com.uwyn.rife2:bld-spring-boot:0.9.5 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.sourceDirectories= bld.version=1.9.1 diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 771874f..e317c92 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.1.0 +bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.0.1 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,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 26f0614..90598cf 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, 6); + version = version(0, 9, 5); 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 c45138c..ca58e2a 100644 --- a/src/main/java/rife/bld/extension/BootUtils.java +++ b/src/main/java/rife/bld/extension/BootUtils.java @@ -17,6 +17,8 @@ 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 da4bd53..9362df4 100644 --- a/src/main/java/rife/bld/extension/BootWarOperation.java +++ b/src/main/java/rife/bld/extension/BootWarOperation.java @@ -139,7 +139,6 @@ 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 20429c6..c5d5508 100644 --- a/src/test/java/rife/bld/extension/BootJarOperationTest.java +++ b/src/test/java/rife/bld/extension/BootJarOperationTest.java @@ -24,6 +24,7 @@ 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; @@ -276,12 +277,10 @@ 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).sourceDirectories("src/main/java"); + var bootJar = new BootJarOperation().fromProject(project); assertThat(bootJar.mainClass()).as("mainClass").isEqualTo(MAIN_CLASS); - assertThat(bootJar.sourceDirectories()).as("sourceDirectories.size").hasSize(3) - .containsExactly(project.buildMainDirectory(), project.srcMainResourcesDirectory(), - new File("src/main/java")); + assertThat(bootJar.sourceDirectories()).as("sourceDirectories.size").hasSize(2); 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"); @@ -289,7 +288,8 @@ 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()).isEqualTo(project.buildDistDirectory()); + assertThat(bootJar.destinationDirectory().getAbsolutePath()).as("destinationDirectory") + .isEqualTo(Path.of(tmp_dir.getPath(), "build", "dist").toString()); assertThat(bootJar.infLibs()).as("infoLibs").isEmpty(); assertThat(bootJar.launcherLibs()).as("launcherJars").isEmpty(); assertThat(bootJar.destinationFileName()).isEqualTo("test_project-0.0.1-boot.jar");