From 15034b436342c2be11e919024dd3c5a5a264347b Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 28 Aug 2024 14:45:44 -0700 Subject: [PATCH 1/2] Bumped JUnit to version 5.11.0 --- .../src/bld/java/com/example/PropertyFileExampleBuild.java | 4 ++-- .../rife/bld/extension/propertyfile/PropertyFileBuild.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/src/bld/java/com/example/PropertyFileExampleBuild.java b/examples/src/bld/java/com/example/PropertyFileExampleBuild.java index 7cc4319..dc57ddc 100644 --- a/examples/src/bld/java/com/example/PropertyFileExampleBuild.java +++ b/examples/src/bld/java/com/example/PropertyFileExampleBuild.java @@ -42,8 +42,8 @@ public class PropertyFileExampleBuild extends Project { repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 3))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 3))); + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 0))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 0))); } public static void main(String[] args) { diff --git a/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java b/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java index a0b3afb..231957f 100644 --- a/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java +++ b/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java @@ -45,8 +45,8 @@ public class PropertyFileBuild extends Project { .include(dependency("com.uwyn.rife2", "bld", version(2, 0, 1))); scope(test) .include(dependency("org.jsoup", "jsoup", version(1, 18, 1))) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 3))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 3))) + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 0))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 0))) .include(dependency("org.assertj:assertj-joda-time:2.2.0")); javadocOperation() From 2600e74be712c73f24e3e3112bbd566361ddc092 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 28 Aug 2024 14:47:14 -0700 Subject: [PATCH 2/2] Cleaned up API to match bld operations aand options APIs --- examples/lib/bld/bld-wrapper.properties | 2 +- examples/version.properties | 8 +++---- .../propertyfile/PropertyFileBuild.java | 2 +- .../propertyfile/PropertyFileOperation.java | 23 +++++++++++++++++-- .../PropertyFileOperationTest.java | 14 +++++++++++ 5 files changed, 41 insertions(+), 8 deletions(-) diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties index 1b2f976..f98d857 100644 --- a/examples/lib/bld/bld-wrapper.properties +++ b/examples/lib/bld/bld-wrapper.properties @@ -1,6 +1,6 @@ #Sun Apr 02 10:32:44 PDT 2023 bld.downloadExtensionSources=true bld.downloadLocation= -bld.extension=com.uwyn.rife2:bld-property-file:0.9.6 +bld.extension=com.uwyn.rife2:bld-property-file:0.9.7-SNAPSHOT bld.repositories=MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.version=2.0.1 diff --git a/examples/version.properties b/examples/version.properties index 8a1539b..1a586ce 100644 --- a/examples/version.properties +++ b/examples/version.properties @@ -1,7 +1,7 @@ # -#Sun Jul 28 22:07:37 PDT 2024 -build.date=2024-07-28 +#Wed Aug 28 14:44:44 PDT 2024 +build.date=2024-08-28 release=beta.20240728220737 -version.major=1 +version.major=3 version.minor=1 -version.patch=20 +version.patch=10 diff --git a/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java b/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java index 231957f..da8b063 100644 --- a/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java +++ b/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java @@ -34,7 +34,7 @@ public class PropertyFileBuild extends Project { public PropertyFileBuild() { pkg = "rife.bld.extension"; name = "bld-property-file"; - version = version(0, 9, 6); + version = version(0, 9, 7, "SNAPSHOT"); javaRelease = 17; downloadSources = true; diff --git a/src/main/java/rife/bld/extension/propertyfile/PropertyFileOperation.java b/src/main/java/rife/bld/extension/propertyfile/PropertyFileOperation.java index c86204e..ec5df99 100644 --- a/src/main/java/rife/bld/extension/propertyfile/PropertyFileOperation.java +++ b/src/main/java/rife/bld/extension/propertyfile/PropertyFileOperation.java @@ -21,6 +21,7 @@ import rife.bld.operations.AbstractOperation; import rife.bld.operations.exceptions.ExitStatusException; import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.Properties; @@ -152,8 +153,26 @@ public class PropertyFileOperation extends AbstractOperation