Minor cleanup

.circleci/config.yml

@@ -1,4 +1,4 @@
-inversion: 2
+version: 2
 defaults: &defaults
   working_directory: ~/repo
   environment:
@@ -6,7 +6,7 @@ defaults: &defaults
     TERM: dumb
     CI_NAME: "CircleCI"
 
-defaults_gradle: &defaults_bld
+defaults_bld: &defaults_bld
   steps:
     - checkout
     - run:

.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:
@@ -11,18 +11,18 @@ jobs:
 
     strategy:
       matrix:
-        java-version: [ 17, 20 ]
+        java-version: [17, 21, 22]
 
     steps:
       - name: Checkout source repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
+          distribution: "zulu"
           java-version: ${{ matrix.java-version }}
 
       - name: Grant execute permission for bld
@@ -50,4 +50,3 @@ jobs:
         if: success() && matrix.java-version == env.COVERAGE_SDK
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-

.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.8.0.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-1.9.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-1.8.0-sources.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-1.9.1-sources.jar!/" />
     </SOURCES>
     <excluded>
       <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

.vscode/launch.json

@@ -1,11 +1,11 @@
 {
-    "version": "0.2.0",
+  "version": "0.2.0",
-    "configurations": [
+  "configurations": [
-        {
+    {
-            "type": "java",
+      "type": "java",
-            "name": "Run Tests",
+      "name": "Run Tests",
-            "request": "launch",
+      "request": "launch",
-            "mainClass": "net.thauvin.erik.httpstatus.HttpStatusTest"
+      "mainClass": "net.thauvin.erik.httpstatus.HttpStatusTest"
-        }
+    }
-    ]
+  ]
 }

.vscode/settings.json

@@ -3,13 +3,12 @@
         "src/main/java",
         "src/main/resources",
         "src/test/java",
-        "src/bld/java"
+        "src/bld/java",
+        "src/bld/resources"
     ],
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.project.referencedLibraries": [
-        "${HOME}bld-1.7.0.jar",
+        "${HOME}/.bld/dist/bld-1.9.1.jar",
-        "lib/compile/*.jar",
+        "lib/**/*.jar",
-        "lib/runtime/*.jar",
-        "lib/test/*.jar"
     ]
 }

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2023, Erik C. Thauvin (erik@thauvin.net)
+Copyright (c) 2015-2024, Erik C. Thauvin (erik@thauvin.net)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

config/pmd.xml

@@ -24,8 +24,8 @@
     <rule ref="category/java/codestyle.xml">
         <exclude name="AtLeastOneConstructor"/>
         <exclude name="ClassNamingConventions"/>
-        <exclude name="ConfusingTernary"/>
         <exclude name="CommentDefaultAccessModifier"/>
+        <exclude name="ConfusingTernary"/>
         <exclude name="FieldNamingConventions"/>
         <exclude name="LocalVariableCouldBeFinal"/>
         <exclude name="LongVariable"/>
@@ -35,8 +35,9 @@
         <exclude name="ShortClassName"/>
         <exclude name="ShortMethodName"/>
         <exclude name="ShortVariable"/>
-        <exclude name="UselessParentheses"/>
+        <exclude name="UseExplicitTypes"/>
         <exclude name="UseUnderscoresInNumericLiterals"/>
+        <exclude name="UselessParentheses"/>
     </rule>
 
     <rule ref="category/java/codestyle.xml/UnnecessaryImport">
@@ -52,8 +53,6 @@
         <exclude name="AvoidUncheckedExceptionsInSignatures"/>
         <exclude name="CognitiveComplexity"/>
         <exclude name="CyclomaticComplexity"/>
-        <exclude name="ExcessiveClassLength"/>
-        <exclude name="ExcessiveMethodLength"/>
         <exclude name="ExcessiveParameterList"/>
         <exclude name="ExcessivePublicCount"/>
         <exclude name="GodClass"/>
@@ -107,4 +106,4 @@
     <!-- SECURITY -->
     <rule ref="category/java/security.xml">
     </rule>
-</ruleset>
+</ruleset>

lib/bld/bld-wrapper.properties

@@ -1,7 +1,7 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
-bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.5
+bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.9
-bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.2
+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.8.0
+bld.version=1.9.1

pom.xml

@@ -11,7 +11,7 @@
   <licenses>
     <license>
       <name>The BSD 3-Clause License</name>
-      <url>http://opensource.org/licenses/BSD-3-Clause</url>
+      <url>https://opensource.org/licenses/BSD-3-Clause</url>
     </license>
   </licenses>
   <dependencies>
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>jakarta.el</groupId>
       <artifactId>jakarta.el-api</artifactId>
-      <version>5.0.1</version>
+      <version>6.0.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

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

@@ -50,6 +50,11 @@ import static rife.bld.dependencies.Scope.test;
 import static rife.bld.operations.JavadocOptions.DocLinkOption.NO_MISSING;
 
 public class HttpStatusBuild extends Project {
+    final PmdOperation pmdOp = new PmdOperation()
+            .fromProject(this)
+            .failOnViolation(true)
+            .ruleSets("config/pmd.xml");
+
     public HttpStatusBuild() {
         pkg = "net.thauvin.erik.httpstatus";
         name = "HttpStatus";
@@ -69,11 +74,11 @@ public class HttpStatusBuild extends Project {
         scope(compile)
                 .include(dependency("jakarta.servlet", "jakarta.servlet-api", version(6, 0, 0)))
                 .include(dependency("jakarta.servlet.jsp", "jakarta.servlet.jsp-api", version(3, 1, 1)))
-                .include(dependency("jakarta.el", "jakarta.el-api", version(5, 0, 1)));
+                .include(dependency("jakarta.el", "jakarta.el-api", version(6, 0, 0)));
         scope(test)
-                .include(dependency("org.assertj", "assertj-core", version(3, 25, 2)))
+                .include(dependency("org.assertj", "assertj-core", version(3, 25, 3)))
-                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 1)))
+                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 2)))
-                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 1)));
+                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 2)));
 
         jarOperation().manifestAttribute(Attributes.Name.MAIN_CLASS, pkg + '.' + "Reasons");
 
@@ -104,7 +109,7 @@ public class HttpStatusBuild extends Project {
                         .license(
                                 new PublishLicense()
                                         .name("The BSD 3-Clause License")
-                                        .url("http://opensource.org/licenses/BSD-3-Clause")
+                                        .url("https://opensource.org/licenses/BSD-3-Clause")
                         )
                         .scm(new PublishScm()
                                 .connection("scm:git:" + url + ".git")
@@ -127,11 +132,12 @@ public class HttpStatusBuild extends Project {
 
     @BuildCommand(summary = "Runs PMD analysis")
     public void pmd() {
-        new PmdOperation()
+        pmdOp.execute();
-                .fromProject(this)
+    }
-                .failOnViolation(true)
+
-                .ruleSets("config/pmd.xml")
+    @BuildCommand(value = "pmd-cli", summary = "Runs PMD analysis (CLI)")
-                .execute();
+    public void pmdCli() {
+        pmdOp.includeLineNumber(false).execute();
     }
 
     @Override
@@ -147,7 +153,7 @@ public class HttpStatusBuild extends Project {
     }
 
     private void rootPom() throws FileUtilsErrorException {
-        PomBuilder.generateInto(publishOperation().info(), publishOperation().dependencies(),
+        PomBuilder.generateInto(publishOperation().info(), dependencies(),
                 Path.of(workDirectory.getPath(), "pom.xml").toFile());
     }
 }