.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,25 +8,29 @@ jobs:
 
     strategy:
       matrix:
-        java-version: [ 17, 21, 22 ]
+        java-version: [17, 21, 22]
 
     steps:
       - name: Checkout source repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Set up JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           distribution: "zulu"
           java-version: ${{ matrix.java-version }}
 
-      - name: Download dependencies
+      - name: Grant execute permission for bld
+        run: chmod +x bld
+
+      - name: Download the dependencies
         run: ./bld download
 
-      - name: Run tests
+      - name: Run tests with bld
         run: >-
           ./bld compile test
           -DtestsBadgeUrl=https://rife2.com/tests-badge/update/com.uwyn.rife2/rife2-renderers
           -DtestsBadgeApiKey=${{ secrets.TESTS_BADGE_API_KEY }}
+

.github/workflows/pages.yml

@@ -3,7 +3,7 @@ name: javadocs-pages
 on:
   # Runs on pushes targeting the default branch
   push:
-    branches: ["master"]
+    branches: [ "master" ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -30,14 +30,14 @@ jobs:
 
     steps:
       - name: Checkout source repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
-          distribution: "zulu"
+          distribution: 'zulu'
           java-version: 17
 
       - name: Build Javadocs
@@ -50,8 +50,8 @@ jobs:
         uses: actions/upload-pages-artifact@v1
         with:
           # Upload generated Javadocs repository
-          path: "build/javadoc/"
+          path: 'build/javadoc/'
 
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v1

.github/workflows/publish.yml

@@ -3,7 +3,7 @@ name: Publish to the Maven Central/Rife2
 on:
   workflow_dispatch:
   release:
-    types: [released]
+    types: [ released ]
 
 jobs:
   build-bld-project:
@@ -11,23 +11,26 @@ jobs:
 
     steps:
       - name: Checkout source repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
-          distribution: "temurin"
+          distribution: 'temurin'
           java-version: 17
 
-      - name: Download dependencies
+      - name: Grant execute permission for bld
+        run: chmod +x bld
+
+      - name: Download the dependencies
         run: ./bld download
 
       - name: Import key
         run: echo "${{ secrets.SIGN_SECRET_KEY }}" | gpg --batch --import
-
+        
-      - name: Publish
+      - name: Publish with bld
         run: >-
           ./bld compile test publish
           -DtestsBadgeUrl=https://rife2.com/tests-badge/update/com.uwyn.rife2/rife2-renderers
@@ -38,6 +41,6 @@ jobs:
           -DsonatypePassword=${{ secrets.SONATYPE_PASSWORD }}
           -DsignKey=${{ secrets.SIGN_KEY }}
           -DsignPassphrase=${{ secrets.SIGN_PASSPHRASE }}
-
+          
       - name: Delete GnuPG data
         run: rm -rfv $HOME/.gnupg

.idea/bld.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="BldConfiguration">
-    <events />
-  </component>
-</project>

.idea/libraries/bld.xml

@@ -2,12 +2,12 @@
   <library name="bld">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-2.0.1.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-1.9.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-2.0.1-sources.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-1.9.0-sources.jar!/" />
     </SOURCES>
     <excluded>
       <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

.vscode/settings.json

@@ -9,7 +9,7 @@
     ],
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.project.referencedLibraries": [
-        "${HOME}/.bld/dist/bld-2.0.1.jar",
+        "${HOME}/.bld/dist/bld-1.9.0.jar",
         "lib/**/*.jar"
     ]
 }

README.md

@@ -1,6 +1,6 @@
 [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
-[![bld](https://img.shields.io/badge/2.0.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
+[![bld](https://img.shields.io/badge/1.9.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/rife2/rife2-template-renderers)](https://github.com/rife2/rife2-template-renderers/releases/latest)
 [![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/rife2-renderers/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/rife2-renderers)
 [![Maven Central](https://img.shields.io/maven-central/v/com.uwyn.rife2/rife2-renderers)](https://central.sonatype.com/artifact/com.uwyn.rife2/rife2-renderers/)

config/pmd.xml

@@ -19,13 +19,19 @@
         </properties>
     </rule>
 
+    <rule ref="category/java/bestpractices.xml/ReplaceHashtableWithMap">
+        <properties>
+            <property name="violationSuppressXPath" value="//ClassOrInterfaceDeclaration['java.util.Properties']"/>
+        </properties>
+    </rule>
+
 
     <!-- CODE STYLE -->
     <rule ref="category/java/codestyle.xml">
         <exclude name="AtLeastOneConstructor"/>
         <exclude name="ClassNamingConventions"/>
-        <exclude name="CommentDefaultAccessModifier"/>
         <exclude name="ConfusingTernary"/>
+        <exclude name="CommentDefaultAccessModifier"/>
         <exclude name="FieldNamingConventions"/>
         <exclude name="LocalVariableCouldBeFinal"/>
         <exclude name="LongVariable"/>
@@ -35,9 +41,8 @@
         <exclude name="ShortClassName"/>
         <exclude name="ShortMethodName"/>
         <exclude name="ShortVariable"/>
-        <exclude name="UseExplicitTypes"/>
-        <exclude name="UseUnderscoresInNumericLiterals"/>
         <exclude name="UselessParentheses"/>
+        <exclude name="UseUnderscoresInNumericLiterals"/>
     </rule>
 
     <rule ref="category/java/codestyle.xml/UnnecessaryImport">
@@ -53,6 +58,8 @@
         <exclude name="AvoidUncheckedExceptionsInSignatures"/>
         <exclude name="CognitiveComplexity"/>
         <exclude name="CyclomaticComplexity"/>
+        <exclude name="ExcessiveClassLength"/>
+        <exclude name="ExcessiveMethodLength"/>
         <exclude name="ExcessiveParameterList"/>
         <exclude name="ExcessivePublicCount"/>
         <exclude name="GodClass"/>
@@ -106,4 +113,4 @@
     <!-- SECURITY -->
     <rule ref="category/java/security.xml">
     </rule>
-</ruleset>
+</ruleset>

lib/bld/bld-wrapper.properties

@@ -1,8 +1,8 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
-bld.downloadLocation=
+bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.7
-bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.7
+bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.3
-bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.4
 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.0.1
+bld.downloadLocation=
+bld.version=1.9.0

src/bld/java/rife/render/TemplateRenderersBuild.java

@@ -27,6 +27,7 @@ import rife.bld.publish.PublishInfo;
 import rife.bld.publish.PublishLicense;
 import rife.bld.publish.PublishScm;
 
+import java.io.IOException;
 import java.util.List;
 
 import static rife.bld.dependencies.Repository.*;
@@ -40,7 +41,7 @@ public class TemplateRenderersBuild extends Project {
     public TemplateRenderersBuild() {
         pkg = "rife.render";
         name = "rife2-template-renderers";
-        version = version(1, 1, 6, "SNAPSHOT");
+        version = version(1, 1, 5);
 
         javaRelease = 17;
         downloadSources = true;
@@ -48,11 +49,11 @@ public class TemplateRenderersBuild extends Project {
         repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
 
         scope(compile)
-                .include(dependency("com.uwyn.rife2", "rife2", version(1, 8, 0)));
+                .include(dependency("com.uwyn.rife2", "rife2", version(1, 7, 3)));
         scope(test)
-                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 3)))
+                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 2)))
-                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 3)))
+                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 2)))
-                .include(dependency("org.assertj", "assertj-core", version(3, 26, 3)));
+                .include(dependency("org.assertj", "assertj-core", version(3, 25, 3)));
 
         javadocOperation().javadocOptions()
                 .docTitle("<a href=\"https://rife2.com\">RIFE2</a> Template Renderers")
@@ -61,13 +62,13 @@ public class TemplateRenderersBuild extends Project {
                 .link("https://rife2.github.io/rife2/");
 
         publishOperation()
-                .repository(version.isSnapshot() ? SONATYPE_SNAPSHOTS
+                .repository(version.isSnapshot() ? repository(SONATYPE_SNAPSHOTS.location())
                         .withCredentials(property("sonatypeUser"), property("sonatypePassword"))
-                        : SONATYPE_RELEASES
+                        : repository(SONATYPE_RELEASES.location())
                         .withCredentials(property("sonatypeUser"), property("sonatypePassword")))
-                .repository(version.isSnapshot() ? RIFE2_SNAPSHOTS
+                .repository(version.isSnapshot() ? repository(RIFE2_SNAPSHOTS.location())
                         .withCredentials(property("rife2Username"), property("rife2Password"))
-                        : RIFE2_RELEASES
+                        : repository(RIFE2_RELEASES.location())
                         .withCredentials(property("rife2Username"), property("rife2Password")))
                 .info(new PublishInfo()
                         .groupId("com.uwyn.rife2")
@@ -80,7 +81,7 @@ public class TemplateRenderersBuild extends Project {
                         .developer(new PublishDeveloper().id("gbevin").name("Geert Bevin").email("gbevin@uwyn.com")
                                 .url("https://github.com/gbevin"))
                         .license(new PublishLicense().name("The Apache License, Version 2.0")
-                                .url("https://www.apache.org/licenses/LICENSE-2.0.txt"))
+                                .url("http://www.apache.org/licenses/LICENSE-2.0.txt"))
                         .scm(new PublishScm().connection("scm:git:https://github.com/rife2/rife2-template-renderers.git")
                                 .developerConnection("scm:git:git@github.com:rife2/rife2-template-renderers.git")
                                 .url("https://github.com/rife2/rife2-template-renderers"))
@@ -93,14 +94,14 @@ public class TemplateRenderersBuild extends Project {
     }
 
     @BuildCommand(summary = "Generates JaCoCo Reports")
-    public void jacoco() throws Exception {
+    public void jacoco() throws IOException {
         new JacocoReportOperation()
                 .fromProject(this)
                 .execute();
     }
 
     @BuildCommand(summary = "Runs PMD analysis")
-    public void pmd() throws Exception {
+    public void pmd() {
         new PmdOperation()
                 .fromProject(this)
                 .failOnViolation(true)
@@ -114,4 +115,4 @@ public class TemplateRenderersBuild extends Project {
                 .apiKey(property("testsBadgeApiKey"))
                 .fromProject(this));
     }
-}
+}