From c80ea7b7d39988c803cfe85a418075d61c448cf4 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 16 Aug 2023 09:14:00 -0700
Subject: [PATCH] Upgraded dependencies

---
 .idea/misc.xml                                |   4 +++
 .idea/modules.xml                             |   1 -
 lib/bld/bld-wrapper.jar                       | Bin 27258 -> 27258 bytes
 .../erik/httpstatus/HttpStatusBuild.java      |  33 ++++++++----------
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index a092c32..e43bc12 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -2,6 +2,10 @@
   <component name="EntryPointsManager">
     <pattern value="net.thauvin.erik.httpstatus.HttpStatusBuild" />
     <pattern value="net.thauvin.erik.httpstatus.HttpStatusBuild" method="pmd" />
+    <pattern value="net.thauvin.erik.httpstatus.HttpStatusBuild" method="jacoco" />
+    <pattern value="net.thauvin.erik.httpstatus.taglibs.XmlSupport" method="setDefault" />
+    <pattern value="net.thauvin.erik.httpstatus.taglibs.XmlSupport" method="setEscapeXml" />
+    <pattern value="net.thauvin.erik.httpstatus.taglibs.ReasonTag" method="setCode" />
   </component>
   <component name="PDMPlugin">
     <option name="customRuleSets">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 55adcb9..354189b 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/app.iml" filepath="$PROJECT_DIR$/.idea/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/bld.iml" filepath="$PROJECT_DIR$/.idea/bld.iml" />
     </modules>
   </component>
diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar
index 28a07b517ed576198d012e5a0f2f2bee4d6cf8c1..623720b4bb61fe96842545ec5108ff6df8b3e8f5 100644
GIT binary patch
delta 131
zcmex$h4I%FM&1B#W)=|!4h{|m6=s2nymib#YGa?aF^Jy0$GDpb%<wWhs0(KBrJQF3
wGajTGf~6*lWY~iQCWmD>gXuXLo?!Y#MhKX;&vXUT?U`{9@l1a(ZI$H!0A~0g&;S4c

delta 131
zcmex$h4I%FM&1B#W)=|!4h{|m^Aw(mymib#YGa?aF^Jy0$GDpb%<wWhs0(KBrJQF3
wGajTGf~6*lWY~iQCWmD>gXuXLo?!Y#MhKX;&vXUT?U`{9@l1a(ZI$H!0Mhv;@Bjb+

diff --git a/src/bld/java/net/thauvin/erik/httpstatus/HttpStatusBuild.java b/src/bld/java/net/thauvin/erik/httpstatus/HttpStatusBuild.java
index a14d668..70be27f 100644
--- a/src/bld/java/net/thauvin/erik/httpstatus/HttpStatusBuild.java
+++ b/src/bld/java/net/thauvin/erik/httpstatus/HttpStatusBuild.java
@@ -34,18 +34,14 @@ package net.thauvin.erik.httpstatus;
 
 import rife.bld.BuildCommand;
 import rife.bld.Project;
-import rife.bld.dependencies.Dependency;
 import rife.bld.extension.JacocoReportOperation;
 import rife.bld.extension.PmdOperation;
-import rife.bld.publish.PublishDeveloper;
-import rife.bld.publish.PublishInfo;
-import rife.bld.publish.PublishLicense;
-import rife.bld.publish.PublishScm;
+import rife.bld.operations.JUnitOperation;
+import rife.bld.publish.*;
+import rife.tools.FileUtils;
 
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
 import java.util.List;
 
 import static rife.bld.dependencies.Repository.*;
@@ -75,8 +71,8 @@ public class HttpStatusBuild extends Project {
                 .include(dependency("jakarta.el", "jakarta.el-api", version(5, 0, 1)));
         scope(test)
                 .include(dependency("org.assertj", "assertj-joda-time", version(2, 2, 0)))
-                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 3)))
-                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 3)));
+                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 0)))
+                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 0)));
 
         javadocOperation().javadocOptions()
                 .docTitle(description + ' ' + version.toString())
@@ -93,6 +89,7 @@ public class HttpStatusBuild extends Project {
                         .groupId(pkg)
                         .artifactId(name.toLowerCase())
                         .name(name)
+                        .version(version)
                         .description(description)
                         .url(url)
                         .developer(new PublishDeveloper().id("ethauvin").name("Erik C. Thauvin").email("erik@thauvin.net")
@@ -110,16 +107,7 @@ public class HttpStatusBuild extends Project {
         new HttpStatusBuild().start(args);
     }
 
-    @Override
-    public void publish() throws Exception {
-        super.publish();
-        var pomPath = Path.of(MAVEN_LOCAL.getArtifactLocation(new Dependency(pkg, name.toLowerCase(), version)),
-                version.toString(),
-                name.toLowerCase() + '-' + version + ".pom");
-        Files.copy(pomPath, Path.of(workDirectory.getAbsolutePath(), "pom.xml"), StandardCopyOption.REPLACE_EXISTING);
-    }
-
-    @BuildCommand(summary = "Generates Jacoco Reports")
+    @BuildCommand(summary = "Generates JaCoCo Reports")
     public void jacoco() throws IOException {
         new JacocoReportOperation()
                 .fromProject(this)
@@ -134,4 +122,11 @@ public class HttpStatusBuild extends Project {
                 .ruleSets("config/pmd.xml")
                 .execute();
     }
+
+    @Override
+    public void publish() throws Exception {
+        super.publish();
+        var xml = new PomBuilder().info(publishOperation().info()).dependencies(dependencies).build();
+        FileUtils.writeString(xml, Path.of(workDirectory.getPath(), "pom.xml").toFile());
+    }
 }
\ No newline at end of file