Bumped bld to version 2.1.0

.circleci/config.yml

@@ -1,41 +1,42 @@
-version: 2
+version: 2.1
-defaults: &defaults
-  working_directory: ~/repo
-  environment:
-    JVM_OPTS: -Xmx3200m
-    TERM: dumb
-    CI_NAME: "CircleCI"
-
-defaults_bld: &defaults_bld
-  steps:
-    - checkout
-    - run:
-        name: Download the dependencies
-        command: ./bld download
-    - run:
-        name: Run tests with bld
-        command: ./bld compile test
 
+commands:
+  build_and_test:
+    parameters:
+      reports-dir:
+        type: string
+        default: "build/reports/test_results"
+    steps:
+      - checkout
+      - run:
+          name: Download dependencies
+          command: ./bld download
+      - run:
+          name: Compile source
+          command: ./bld compile
+      - run:
+          name: Run tests
+          command: ./bld jacoco -reports-dir=<< parameters.reports-dir >>
+      - store_test_results:
+          path: << parameters.reports-dir >>
+      - store_artifacts:
+          path: build/reports/jacoco/test/html
 jobs:
-  bld_jdk20:
-    <<: *defaults
-
-    docker:
-      - image: cimg/openjdk:20.0
-
-    <<: *defaults_bld
-
   bld_jdk17:
-    <<: *defaults
-
     docker:
       - image: cimg/openjdk:17.0
+    steps:
+      - build_and_test
 
-    <<: *defaults_bld
+  bld_jdk21:
+    docker:
+      - image: cimg/openjdk:21.0
+    steps:
+      - build_and_test
 
 workflows:
-  version: 2
   bld:
     jobs:
       - bld_jdk17
-      - bld_jdk20
+      - bld_jdk21
+

.github/workflows/bld.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      COVERAGE_SDK: "17"
+      COVERAGE_JDK: "17"
 
     strategy:
       matrix:
@@ -25,28 +25,28 @@ jobs:
           distribution: "zulu"
           java-version: ${{ matrix.java-version }}
 
-      - name: Grant execute permission for bld
+      - name: Download dependencies
-        run: chmod +x bld
-
-      - name: Download the dependencies
         run: ./bld download
 
-      - name: Run tests with bld
+      - name: Compile source
-        run: ./bld compile jacoco
+        run: ./bld compile
+
+      - name: Run tests
+        run: ./bld jacoco
 
       - name: Remove pom.xml
-        if: success() && matrix.java-version == env.COVERAGE_SDK
+        if: success() && matrix.java-version == env.COVERAGE_JDK
         run: rm -rf pom.xml
 
       - name: SonarCloud Scan
         uses: sonarsource/sonarcloud-github-action@master
-        if: success() && matrix.java-version == env.COVERAGE_SDK
+        if: success() && matrix.java-version == env.COVERAGE_JDK
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3
-        if: success() && matrix.java-version == env.COVERAGE_SDK
+        if: success() && matrix.java-version == env.COVERAGE_JDK
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.idea/bld.xml

@@ -0,0 +1,6 @@
+<?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-1.9.1.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.1.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-1.9.1-sources.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.1.0-sources.jar!/" />
     </SOURCES>
     <excluded>
       <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

.idea/libraries/compile.xml

@@ -7,7 +7,7 @@
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/compile" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" type="SOURCES" />
   </library>
 </component>

.idea/libraries/runtime.xml

@@ -8,7 +8,7 @@
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/runtime" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" type="SOURCES" />
   </library>
 </component>

.idea/libraries/test.xml

@@ -8,7 +8,7 @@
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/test" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" type="SOURCES" />
   </library>
 </component>

.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <pattern value="net.thauvin.erik.httpstatus.HttpStatusBuild" />

.vscode/settings.json

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

README.md

@@ -2,7 +2,7 @@
 
 [![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](http://opensource.org/licenses/BSD-3-Clause)
 [![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/1.9.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
+[![bld](https://img.shields.io/badge/2.1.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
 [![Release](https://img.shields.io/github/release/ethauvin/httpstatus.svg)](https://github.com/ethauvin/httpstatus/releases/latest)
 [![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/net.thauvin.erik.httpstatus/httpstatus?label=sanpshot&server=https%3A%2F%2Foss.sonatype.org)](https://oss.sonatype.org/content/repositories/snapshots/net/thauvin/erik/httpstatus/httpstatus/)
 [![Maven Central](https://img.shields.io/maven-central/v/net.thauvin.erik.httpstatus/httpstatus.svg?color=blue)](https://central.sonatype.com/artifact/net.thauvin.erik.httpstatus/httpstatus)

lib/bld/bld-wrapper.properties

@@ -1,7 +1,7 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
-bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.0.1
-bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.5
-bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES,MAVEN_LOCAL,RIFE2_SNAPSHOTS
 bld.downloadLocation=
-bld.version=1.9.1
+bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.8
+bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.5
+bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES,MAVEN_LOCAL,RIFE2_SNAPSHOTS
+bld.version=2.1.0

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>net.thauvin.erik.httpstatus</groupId>
   <artifactId>httpstatus</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2-SNAPSHOT</version>
   <name>HttpStatus</name>
   <description>Tag library to display the code, reason, cause and/or message for HTTP status codes in JSP error pages</description>
   <url>https://github.com/ethauvin/HttpStatus</url>
@@ -18,19 +18,19 @@
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
-      <version>6.0.0</version>
+      <version>6.1.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>jakarta.servlet.jsp</groupId>
       <artifactId>jakarta.servlet.jsp-api</artifactId>
-      <version>3.1.1</version>
+      <version>4.0.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>jakarta.el</groupId>
       <artifactId>jakarta.el-api</artifactId>
-      <version>6.0.0</version>
+      <version>6.0.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

src/bld/java/net/thauvin/erik/httpstatus/HttpStatusBuild.java

@@ -39,8 +39,7 @@ import rife.bld.extension.PmdOperation;
 import rife.bld.publish.*;
 import rife.tools.exceptions.FileUtilsErrorException;
 
-import java.io.IOException;
+import java.io.File;
-import java.nio.file.Path;
 import java.util.List;
 import java.util.jar.Attributes;
 
@@ -58,7 +57,7 @@ public class HttpStatusBuild extends Project {
     public HttpStatusBuild() {
         pkg = "net.thauvin.erik.httpstatus";
         name = "HttpStatus";
-        version = version(1, 1, 1);
+        version = version(1, 1, 2, "SNAPSHOT");
 
         var description = "Tag library to display the code, reason, cause and/or message for HTTP status codes in JSP error pages";
         var url = "https://github.com/ethauvin/HttpStatus";
@@ -72,13 +71,13 @@ public class HttpStatusBuild extends Project {
         repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS);
 
         scope(compile)
-                .include(dependency("jakarta.servlet", "jakarta.servlet-api", version(6, 0, 0)))
+                .include(dependency("jakarta.servlet", "jakarta.servlet-api", version(6, 1, 0)))
-                .include(dependency("jakarta.servlet.jsp", "jakarta.servlet.jsp-api", version(3, 1, 1)))
+                .include(dependency("jakarta.servlet.jsp", "jakarta.servlet.jsp-api", version(4, 0, 0)))
-                .include(dependency("jakarta.el", "jakarta.el-api", version(6, 0, 0)));
+                .include(dependency("jakarta.el", "jakarta.el-api", version(6, 0, 1)));
         scope(test)
-                .include(dependency("org.assertj", "assertj-core", version(3, 26, 0)))
+                .include(dependency("org.assertj", "assertj-core", version(3, 26, 3)))
-                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 2)))
+                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 0)))
-                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 2)));
+                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 0)));
 
         jarOperation().manifestAttribute(Attributes.Name.MAIN_CLASS, pkg + '.' + "Reasons");
 
@@ -92,6 +91,7 @@ public class HttpStatusBuild extends Project {
                         .withCredentials(property("sonatype.user"), property("sonatype.password"))
                         : repository(SONATYPE_RELEASES_LEGACY.location())
                         .withCredentials(property("sonatype.user"), property("sonatype.password")))
+                .repository(repository("github"))
                 .info(new PublishInfo()
                         .groupId(pkg)
                         .artifactId(name.toLowerCase())
@@ -99,17 +99,15 @@ public class HttpStatusBuild extends Project {
                         .version(version)
                         .description(description)
                         .url(url)
-                        .developer(
+                        .developer(new PublishDeveloper()
-                                new PublishDeveloper()
+                                .id("ethauvin")
-                                        .id("ethauvin")
+                                .name("Erik C. Thauvin")
-                                        .name("Erik C. Thauvin")
+                                .email("erik@thauvin.net")
-                                        .email("erik@thauvin.net")
+                                .url("https://erik.thauvin.net/")
-                                        .url("https://erik.thauvin.net/")
                         )
-                        .license(
+                        .license(new PublishLicense()
-                                new PublishLicense()
+                                .name("The BSD 3-Clause License")
-                                        .name("The BSD 3-Clause License")
+                                .url("https://opensource.org/licenses/BSD-3-Clause")
-                                        .url("https://opensource.org/licenses/BSD-3-Clause")
                         )
                         .scm(new PublishScm()
                                 .connection("scm:git:" + url + ".git")
@@ -124,25 +122,25 @@ public class HttpStatusBuild extends Project {
     }
 
     @BuildCommand(summary = "Generates JaCoCo Reports")
-    public void jacoco() throws IOException {
+    public void jacoco() throws Exception {
         new JacocoReportOperation()
                 .fromProject(this)
                 .execute();
     }
 
     @BuildCommand(summary = "Runs PMD analysis")
-    public void pmd() {
+    public void pmd() throws Exception {
         pmdOp.execute();
     }
 
     @BuildCommand(value = "pmd-cli", summary = "Runs PMD analysis (CLI)")
-    public void pmdCli() {
+    public void pmdCli() throws Exception {
         pmdOp.includeLineNumber(false).execute();
     }
 
     private void pomRoot() throws FileUtilsErrorException {
-        PomBuilder.generateInto(publishOperation().info(), dependencies(),
+        PomBuilder.generateInto(publishOperation().fromProject(this).info(), dependencies(),
-                Path.of(workDirectory.getPath(), "pom.xml").toFile());
+                new File(workDirectory, "pom.xml"));
     }
 
     @Override