Bumped bld to 1.8.0

2024-01-31 15:42:25 -08:00 · 2024-01-31 15:42:25 -08:00 · 1d6a7824fe
commit 1d6a7824fe
parent 4011fe8024
7 changed files with 39 additions and 22 deletions
--- a/.idea/libraries/bld.xml
+++ b/.idea/libraries/bld.xml
@ -2,11 +2,12 @@
  <library name="bld">
    <CLASSES>
      <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-1.7.5.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-1.8.0.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES>
-      <root url="jar://$USER_HOME$/.bld/dist/bld-1.7.5-sources.jar!/" />
+      <root url="file://$PROJECT_DIR$/lib/bld" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-1.8.0-sources.jar!/" />
    </SOURCES>
    <excluded>
      <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />
@ -14,4 +15,4 @@
    <jarDirectory url="file://$PROJECT_DIR$/lib/bld" recursive="false" />
    <jarDirectory url="file://$PROJECT_DIR$/lib/bld" recursive="false" type="SOURCES" />
  </library>
-</component>
+</component>
--- a/.idea/misc.xml
+++ b/.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" />
@ -10,6 +9,11 @@
    <option name="customRuleSets">
      <list>
        <option value="K:\java\semver\config\pmd.xml" />
+        <option value="$PROJECT_DIR$/../bld-pitest/config/pmd.xml" />
+        <option value="$PROJECT_DIR$/../bld-jacoco-report/config/pmd.xml" />
+        <option value="$PROJECT_DIR$/../bld-checkstyle/config/pmd.xml" />
+        <option value="$PROJECT_DIR$/../bld-exec/config/pmd.xml" />
+        <option value="$PROJECT_DIR$/../bld-testng/config/pmd.xml" />
      </list>
    </option>
    <option name="skipTestSources" value="false" />
--- a/README.md
+++ b/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.7.3-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
+[![bld](https://img.shields.io/badge/1.8.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)
@ -55,7 +55,7 @@ or

 would display on a [501 status code](https://www.rfc-editor.org/rfc/rfc9110.html#name-501-not-implemented):

-```plain
+```console
 Not Implemented
 ```

--- a/lib/bld/bld-wrapper.jar
+++ b/lib/bld/bld-wrapper.jar
--- a/lib/bld/bld-wrapper.properties
+++ b/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.2
-bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.1-SNAPSHOT
-bld.repositories=MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES,MAVEN_CENTRAL
+bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.5
+bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.2
+bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES,MAVEN_LOCAL,RIFE2_SNAPSHOTS
 bld.downloadLocation=
-bld.version=1.7.5
+bld.version=1.8.0
--- a/src/bld/java/net/thauvin/erik/httpstatus/HttpStatusBuild.java
+++ b/src/bld/java/net/thauvin/erik/httpstatus/HttpStatusBuild.java
@ -63,6 +63,7 @@ public class HttpStatusBuild extends Project {
        javaRelease = 17;

        downloadSources = true;
+        autoDownloadPurge = true;
        repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS);

        scope(compile)
@ -70,9 +71,9 @@ public class HttpStatusBuild extends Project {
                .include(dependency("jakarta.servlet.jsp", "jakarta.servlet.jsp-api", version(3, 1, 1)))
                .include(dependency("jakarta.el", "jakarta.el-api", version(5, 0, 1)));
        scope(test)
-                .include(dependency("org.assertj", "assertj-core", version(3, 24, 2)))
-                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 0)))
-                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 0)));
+                .include(dependency("org.assertj", "assertj-core", version(3, 25, 2)))
+                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 1)))
+                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 1)));

        jarOperation().manifestAttribute(Attributes.Name.MAIN_CLASS, pkg + '.' + "Reasons");

@ -93,11 +94,20 @@ public class HttpStatusBuild extends Project {
                        .version(version)
                        .description(description)
                        .url(url)
-                        .developer(new PublishDeveloper().id("ethauvin").name("Erik C. Thauvin").email("erik@thauvin.net")
-                                .url("https://erik.thauvin.net/"))
-                        .license(new PublishLicense().name("The BSD 3-Clause License")
-                                .url("http://opensource.org/licenses/BSD-3-Clause"))
-                        .scm(new PublishScm().connection("scm:git:" + url + ".git")
+                        .developer(
+                                new PublishDeveloper()
+                                        .id("ethauvin")
+                                        .name("Erik C. Thauvin")
+                                        .email("erik@thauvin.net")
+                                        .url("https://erik.thauvin.net/")
+                        )
+                        .license(
+                                new PublishLicense()
+                                        .name("The BSD 3-Clause License")
+                                        .url("http://opensource.org/licenses/BSD-3-Clause")
+                        )
+                        .scm(new PublishScm()
+                                .connection("scm:git:" + url + ".git")
                                .developerConnection("scm:git:git@github.com:ethauvin/" + name + ".git")
                                .url(url))
                        .signKey(property("sign.key"))
--- a/src/main/java/net/thauvin/erik/httpstatus/taglibs/CauseTag.java
+++ b/src/main/java/net/thauvin/erik/httpstatus/taglibs/CauseTag.java
@ -32,11 +32,11 @@

 package net.thauvin.erik.httpstatus.taglibs;

-import jakarta.servlet.jsp.JspWriter;
 import jakarta.servlet.jsp.PageContext;
-import net.thauvin.erik.httpstatus.Utils;
-
 import java.io.IOException;
+import net.thauvin.erik.httpstatus.Utils;
+import jakarta.servlet.jsp.JspWriter;
+

 /**
 * The <code>&lt;hs:cause&gt;</code> tag returns the cause (if any) for the current HTTP Status Error Code.
@ -54,6 +54,8 @@ public class CauseTag extends XmlSupport {
        final PageContext pageContext = (PageContext) getJspContext();
        final JspWriter out = pageContext.getOut();

+    
+
        final Throwable cause = pageContext.getErrorData().getThrowable().getCause();

        Utils.outWrite(out, getCause(cause), defaultValue, escapeXml);
@ -72,4 +74,4 @@ public class CauseTag extends XmlSupport {
            return null;
        }
    }
-}
+}