From 99275b3e06bf8d0a9691861ebee24868d9b4f05e Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 3 May 2025 22:47:28 -0700 Subject: [PATCH 1/4] Bump PMD extension to version 1.2.3 --- 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 8d8e3e4..6278903 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.2.2 +bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.2.3 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_RELEASES bld.sourceDirectories= bld.version=2.2.1 From 3d34f7c6de046a8fba8a64eb33ae19e58c7d46ed Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 4 May 2025 02:00:07 -0700 Subject: [PATCH 2/4] Cleanup Tests --- .../{Run Tests.xml => BootOperationTest.xml} | 4 +- .../java/rife/bld/extension/BootUtils.java | 2 +- .../bld/extension/BootJarOperationTest.java | 471 --------------- .../rife/bld/extension/BootOperationTest.java | 563 ++++++++++++++++++ .../rife/bld/extension/BootUtilsTest.java | 132 ++++ 5 files changed, 698 insertions(+), 474 deletions(-) rename .idea/runConfigurations/{Run Tests.xml => BootOperationTest.xml} (62%) delete mode 100644 src/test/java/rife/bld/extension/BootJarOperationTest.java create mode 100644 src/test/java/rife/bld/extension/BootOperationTest.java create mode 100644 src/test/java/rife/bld/extension/BootUtilsTest.java diff --git a/.idea/runConfigurations/Run Tests.xml b/.idea/runConfigurations/BootOperationTest.xml similarity index 62% rename from .idea/runConfigurations/Run Tests.xml rename to .idea/runConfigurations/BootOperationTest.xml index 761a607..6d98a3f 100644 --- a/.idea/runConfigurations/Run Tests.xml +++ b/.idea/runConfigurations/BootOperationTest.xml @@ -1,6 +1,6 @@ - - - + \ No newline at end of file diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 6278903..43cf409 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,6 +1,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= +bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.5 bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.2.3 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_RELEASES bld.sourceDirectories= diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index d243d97..ae8705d 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -22,6 +22,9 @@ import rife.bld.publish.PublishDeveloper; import rife.bld.publish.PublishLicense; import rife.bld.publish.PublishScm; +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.List; import static rife.bld.dependencies.Repository.*; @@ -94,4 +97,34 @@ public class SpringBootBuild extends Project { .ruleSets("config/pmd.xml") .execute(); } + + @Override + public void test() throws Exception { + var testResultsDir = "build/test-results/test/"; + var op = testOperation().fromProject(this); + op.testToolOptions().reportsDir(new File(testResultsDir)); + + Exception ex = null; + try { + op.execute(); + } catch (Exception e) { + ex = e; + } + + var xunitViewer = new File("/usr/bin/xunit-viewer"); + if (xunitViewer.exists() && xunitViewer.canExecute()) { + var reportsDir = "build/reports/tests/test/"; + + Files.createDirectories(Path.of(reportsDir)); + + new ExecOperation() + .fromProject(this) + .command(xunitViewer.getPath(), "-r", testResultsDir, "-o", reportsDir + "index.html") + .execute(); + } + + if (ex != null) { + throw ex; + } + } } From ebb876547321353efa71cb056bb0c70baf48963a Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 21 May 2025 13:43:52 -0700 Subject: [PATCH 4/4] Bump Mockito to version 5.18.0 --- .../src/bld/java/com/example/demo/DemoApplicationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java index e9c9276..ddfb33f 100644 --- a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java +++ b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java @@ -31,7 +31,7 @@ public class DemoApplicationBuild extends WebProject { .include(dependency("org.springframework.boot", "spring-boot-starter", boot)) .include(dependency("org.springframework.boot", "spring-boot-starter-actuator", boot)) .include(dependency("org.springframework.boot", "spring-boot-starter-web", boot)) - .include(dependency("org.mockito:mockito-core:5.17.0")); + .include(dependency("org.mockito:mockito-core:5.18.0")); scope(test) .include(dependency("org.springframework.boot", "spring-boot-starter-test", boot)) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 2)))