From 97edc07160d7a16f3fef87fc5bed22a76d279029 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 29 Oct 2024 22:39:52 -0700 Subject: [PATCH 1/2] Updated dependencies Bumped JDK to version 23 (GitHub CI Workflow) Bumped PMD extensions to version 1.1.7 Bumped JUnit to version 5.11.3 --- .github/workflows/bld.yml | 4 ++-- config/pmd.xml | 4 ++-- lib/bld/bld-wrapper.properties | 2 +- src/bld/java/rife/render/TemplateRenderersBuild.java | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index b8d797d..21791c9 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -1,6 +1,6 @@ name: bld-ci -on: [ push, pull_request, workflow_dispatch ] +on: [push, pull_request, workflow_dispatch] jobs: build-bld-project: @@ -8,7 +8,7 @@ jobs: strategy: matrix: - java-version: [ 17, 21, 22 ] + java-version: [17, 21, 23] steps: - name: Checkout source repository diff --git a/config/pmd.xml b/config/pmd.xml index 3d3203c..2641880 100644 --- a/config/pmd.xml +++ b/config/pmd.xml @@ -7,9 +7,9 @@ - - + + diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index f5d83c2..aba0f19 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -2,7 +2,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.8 -bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.5 +bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.7 bld.extension-tests=com.uwyn.rife2:bld-tests-badge:1.4.6 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.version=2.1.0 diff --git a/src/bld/java/rife/render/TemplateRenderersBuild.java b/src/bld/java/rife/render/TemplateRenderersBuild.java index 19e3563..773530f 100644 --- a/src/bld/java/rife/render/TemplateRenderersBuild.java +++ b/src/bld/java/rife/render/TemplateRenderersBuild.java @@ -40,7 +40,7 @@ public class TemplateRenderersBuild extends Project { public TemplateRenderersBuild() { pkg = "rife.render"; name = "rife2-template-renderers"; - version = version(1, 1, 6); + version = version(1, 1, 7, "SNAPSHOT"); javaRelease = 17; downloadSources = true; @@ -50,8 +50,8 @@ public class TemplateRenderersBuild extends Project { scope(compile) .include(dependency("com.uwyn.rife2", "rife2", version(1, 9, 0))); scope(test) - .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.junit.jupiter", "junit-jupiter", version(5, 11, 3))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 3))) .include(dependency("org.assertj", "assertj-core", version(3, 26, 3))); javadocOperation().javadocOptions() From daadd0bc4af12d37cc069381cd57427359c88cff Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 29 Oct 2024 22:58:26 -0700 Subject: [PATCH 2/2] Added missing and cleaned up JavaDocs --- .idea/misc.xml | 1 + README.md | 2 +- src/main/java/rife/render/Abbreviate.java | 15 ++++++++++-- src/main/java/rife/render/BeatTime.java | 7 +++++- src/main/java/rife/render/Capitalize.java | 7 +++++- src/main/java/rife/render/DateIso.java | 9 +++++-- src/main/java/rife/render/DateTimeIso.java | 12 ++++++++-- .../java/rife/render/DateTimeRfc2822.java | 9 +++++-- src/main/java/rife/render/EncodeBase64.java | 7 +++++- src/main/java/rife/render/EncodeHtml.java | 7 +++++- .../java/rife/render/EncodeHtmlEntities.java | 7 +++++- src/main/java/rife/render/EncodeJs.java | 7 +++++- src/main/java/rife/render/EncodeJson.java | 7 +++++- src/main/java/rife/render/EncodeUnicode.java | 7 +++++- src/main/java/rife/render/EncodeUrl.java | 7 +++++- src/main/java/rife/render/EncodeXml.java | 7 +++++- .../java/rife/render/FormatCreditCard.java | 7 +++++- src/main/java/rife/render/Lowercase.java | 7 +++++- src/main/java/rife/render/Mask.java | 24 ++++++++++++++++++- src/main/java/rife/render/Normalize.java | 7 +++++- src/main/java/rife/render/QrCode.java | 7 +++++- src/main/java/rife/render/RenderUtils.java | 2 +- src/main/java/rife/render/Rot13.java | 7 +++++- src/main/java/rife/render/ShortenUrl.java | 7 +++++- src/main/java/rife/render/SwapCase.java | 10 +++++--- src/main/java/rife/render/TimeIso.java | 9 +++++-- src/main/java/rife/render/Trim.java | 7 +++++- src/main/java/rife/render/Uncapitalize.java | 7 +++++- src/main/java/rife/render/Uppercase.java | 9 +++++-- src/main/java/rife/render/Uptime.java | 7 +++++- src/main/java/rife/render/Year.java | 8 +++++-- src/test/java/rife/render/DisabledOnCi.java | 2 +- src/test/java/rife/render/TestEncode.java | 2 +- 33 files changed, 206 insertions(+), 41 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index b018d04..2fa2388 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,6 +3,7 @@ +