From c9ed08d95d2c2adaa09f6a58f82562ca7b7fe73a Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 16 Mar 2025 12:14:50 -0700
Subject: [PATCH 1/3] Update root pom

---
 pom.xml | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index c2e42dd..ff558a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,19 @@
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib</artifactId>
-      <version>1.9.24</version>
+      <version>2.1.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk7</artifactId>
+      <version>2.1.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <version>2.1.10</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -35,10 +47,16 @@
     </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlinx</groupId>
-      <artifactId>kotlinx-serialization-json-jvm</artifactId>
-      <version>1.6.3</version>
+      <artifactId>kotlinx-serialization-json</artifactId>
+      <version>1.8.0</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.1.0</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <developers>
     <developer>

From cb5cd8fc847b06c062592b0252bf4a3a398829cf Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 16 Mar 2025 12:16:33 -0700
Subject: [PATCH 2/3] Update copyright

---
 src/bld/java/net/thauvin/erik/AkismetBuild.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bld/java/net/thauvin/erik/AkismetBuild.java b/src/bld/java/net/thauvin/erik/AkismetBuild.java
index 456276c..48f7ad4 100644
--- a/src/bld/java/net/thauvin/erik/AkismetBuild.java
+++ b/src/bld/java/net/thauvin/erik/AkismetBuild.java
@@ -1,7 +1,7 @@
 /*
  * AkismetBuild.java
  *
- * Copyright 2019-2024 Erik C. Thauvin (erik@thauvin.net)
+ * Copyright 2019-2025 Erik C. Thauvin (erik@thauvin.net)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

From c94f7331bdcb2b54249ec6c042a764560238f7a0 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 16 Mar 2025 12:42:07 -0700
Subject: [PATCH 3/3] Fix IDEA project

---
 .idea/app.iml                                |  30 +++
 .idea/inspectionProfiles/Project_Default.xml |   2 +-
 .idea/intellij-javadocs-4.0.1.xml            | 204 -------------------
 .idea/libraries/bld.xml                      |   2 +-
 .idea/libraries/test.xml                     |   1 -
 .idea/misc.xml                               |  23 +--
 .idea/modules.xml                            |   1 +
 .idea/runConfigurations/Run Tests.xml        |   2 +-
 8 files changed, 35 insertions(+), 230 deletions(-)
 create mode 100644 .idea/app.iml
 delete mode 100644 .idea/intellij-javadocs-4.0.1.xml

diff --git a/.idea/app.iml b/.idea/app.iml
new file mode 100644
index 0000000..a350d1f
--- /dev/null
+++ b/.idea/app.iml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/build/main" />
+    <output-test url="file://$MODULE_DIR$/build/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" relativeOutputPath="resources" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/kotlin/net/thauvin/erik/akismet" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/kotlin/net/thauvin/erik/akismet" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library" scope="RUNTIME">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/src/main/resources/templates" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" name="compile" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="runtime" level="project" />
+    <orderEntry type="library" scope="TEST" name="test" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 1e01b48..37eb64c 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -5,4 +5,4 @@
       <option name="ADDITIONAL_TAGS" value="created" />
     </inspection_tool>
   </profile>
-</component>
\ No newline at end of file
+</component>
diff --git a/.idea/intellij-javadocs-4.0.1.xml b/.idea/intellij-javadocs-4.0.1.xml
deleted file mode 100644
index e3e0b84..0000000
--- a/.idea/intellij-javadocs-4.0.1.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaDocConfiguration">
-    <GENERAL>
-      <MODE>UPDATE</MODE>
-      <OVERRIDDEN_METHODS>false</OVERRIDDEN_METHODS>
-      <SPLITTED_CLASS_NAME>true</SPLITTED_CLASS_NAME>
-      <LEVELS>
-        <LEVEL>TYPE</LEVEL>
-        <LEVEL>METHOD</LEVEL>
-        <LEVEL>FIELD</LEVEL>
-      </LEVELS>
-      <VISIBILITIES>
-        <VISIBILITY>PROTECTED</VISIBILITY>
-        <VISIBILITY>PUBLIC</VISIBILITY>
-        <VISIBILITY>DEFAULT</VISIBILITY>
-      </VISIBILITIES>
-    </GENERAL>
-    <TEMPLATES>
-      <CLASSES>
-        <CLASS>
-          <KEY>^.*(public|protected|private)*.+interface\s+\w+.*</KEY>
-          <VALUE>/**\n
- * The interface ${name}.\n
-&lt;#if element.typeParameters?has_content&gt;        * \n
-&lt;/#if&gt;
-&lt;#list element.typeParameters as typeParameter&gt;
-        * @param &lt;${typeParameter.name}&gt; the type parameter\n
-&lt;/#list&gt;
- */</VALUE>
-        </CLASS>
-        <CLASS>
-          <KEY>^.*(public|protected|private)*.+enum\s+\w+.*</KEY>
-          <VALUE>/**\n
- * The enum ${name}.\n
- */</VALUE>
-        </CLASS>
-        <CLASS>
-          <KEY>^.*(public|protected|private)*.+class\s+\w+.*</KEY>
-          <VALUE>/**\n
- * The type ${name}.\n
-&lt;#if element.typeParameters?has_content&gt;        * \n
-&lt;/#if&gt;
-&lt;#list element.typeParameters as typeParameter&gt;
-        * @param &lt;${typeParameter.name}&gt; the type parameter\n
-&lt;/#list&gt;
- */</VALUE>
-        </CLASS>
-        <CLASS>
-          <KEY>.+</KEY>
-          <VALUE>/**\n
- * The type ${name}.\n
- */</VALUE>
-        </CLASS>
-      </CLASSES>
-      <CONSTRUCTORS>
-        <CONSTRUCTOR>
-          <KEY>.+</KEY>
-          <VALUE>/**\n
- * Instantiates a new ${name}.\n
-&lt;#if element.parameterList.parameters?has_content&gt;
-         *\n
-&lt;/#if&gt;
-&lt;#list element.parameterList.parameters as parameter&gt;
-         * @param ${parameter.name} the ${paramNames[parameter.name]}\n
-&lt;/#list&gt;
-&lt;#if element.throwsList.referenceElements?has_content&gt;
-         *\n
-&lt;/#if&gt;
-&lt;#list element.throwsList.referenceElements as exception&gt;
-         * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n
-&lt;/#list&gt;
- */</VALUE>
-        </CONSTRUCTOR>
-      </CONSTRUCTORS>
-      <METHODS>
-        <METHOD>
-          <KEY>^.*(public|protected|private)*\s*.*(\w(\s*&lt;.+&gt;)*)+\s+get\w+\s*\(.*\).+</KEY>
-          <VALUE>/**\n
- * Gets ${partName}.\n
-&lt;#if element.typeParameters?has_content&gt;         * \n
-&lt;/#if&gt;
-&lt;#list element.typeParameters as typeParameter&gt;
-         * @param &lt;${typeParameter.name}&gt; the type parameter\n
-&lt;/#list&gt;
-&lt;#if element.parameterList.parameters?has_content&gt;
-         *\n
-&lt;/#if&gt;
-&lt;#list element.parameterList.parameters as parameter&gt;
-         * @param ${parameter.name} the ${paramNames[parameter.name]}\n
-&lt;/#list&gt;
-&lt;#if isNotVoid&gt;
-         *\n
-         * @return the ${partName}\n
-&lt;/#if&gt;
-&lt;#if element.throwsList.referenceElements?has_content&gt;
-         *\n
-&lt;/#if&gt;
-&lt;#list element.throwsList.referenceElements as exception&gt;
-         * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n
-&lt;/#list&gt;
- */</VALUE>
-        </METHOD>
-        <METHOD>
-          <KEY>^.*(public|protected|private)*\s*.*(void|\w(\s*&lt;.+&gt;)*)+\s+set\w+\s*\(.*\).+</KEY>
-          <VALUE>/**\n
- * Sets ${partName}.\n
-&lt;#if element.typeParameters?has_content&gt;         * \n
-&lt;/#if&gt;
-&lt;#list element.typeParameters as typeParameter&gt;
-         * @param &lt;${typeParameter.name}&gt; the type parameter\n
-&lt;/#list&gt;
-&lt;#if element.parameterList.parameters?has_content&gt;
-         *\n
-&lt;/#if&gt;
-&lt;#list element.parameterList.parameters as parameter&gt;
-         * @param ${parameter.name} the ${paramNames[parameter.name]}\n
-&lt;/#list&gt;
-&lt;#if isNotVoid&gt;
-         *\n
-         * @return the ${partName}\n
-&lt;/#if&gt;
-&lt;#if element.throwsList.referenceElements?has_content&gt;
-         *\n
-&lt;/#if&gt;
-&lt;#list element.throwsList.referenceElements as exception&gt;
-         * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n
-&lt;/#list&gt;
- */</VALUE>
-        </METHOD>
-        <METHOD>
-          <KEY>^.*((public\s+static)|(static\s+public))\s+void\s+main\s*\(\s*String\s*(\[\s*\]|\.\.\.)\s+\w+\s*\).+</KEY>
-          <VALUE>/**\n
- * The entry point of application.\n
-
-     &lt;#if element.parameterList.parameters?has_content&gt;
-         *\n
-&lt;/#if&gt;
-     * @param ${element.parameterList.parameters[0].name} the input arguments\n
-&lt;#if element.throwsList.referenceElements?has_content&gt;
-         *\n
-&lt;/#if&gt;
-&lt;#list element.throwsList.referenceElements as exception&gt;
-         * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n
-&lt;/#list&gt;
- */</VALUE>
-        </METHOD>
-        <METHOD>
-          <KEY>.+</KEY>
-          <VALUE>/**\n
- * ${name}&lt;#if isNotVoid&gt; ${return}&lt;/#if&gt;.\n
-&lt;#if element.typeParameters?has_content&gt;         * \n
-&lt;/#if&gt;
-&lt;#list element.typeParameters as typeParameter&gt;
-         * @param &lt;${typeParameter.name}&gt; the type parameter\n
-&lt;/#list&gt;
-&lt;#if element.parameterList.parameters?has_content&gt;
-         *\n
-&lt;/#if&gt;
-&lt;#list element.parameterList.parameters as parameter&gt;
-         * @param ${parameter.name} the ${paramNames[parameter.name]}\n
-&lt;/#list&gt;
-&lt;#if isNotVoid&gt;
-         *\n
-         * @return the ${return}\n
-&lt;/#if&gt;
-&lt;#if element.throwsList.referenceElements?has_content&gt;
-         *\n
-&lt;/#if&gt;
-&lt;#list element.throwsList.referenceElements as exception&gt;
-         * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n
-&lt;/#list&gt;
- */</VALUE>
-        </METHOD>
-      </METHODS>
-      <FIELDS>
-        <FIELD>
-          <KEY>^.*(public|protected|private)*.+static.*(\w\s\w)+.+</KEY>
-          <VALUE>/**\n
- * The constant ${element.getName()}.\n
- */</VALUE>
-        </FIELD>
-        <FIELD>
-          <KEY>^.*(public|protected|private)*.*(\w\s\w)+.+</KEY>
-          <VALUE>/**\n
-    &lt;#if element.parent.isInterface()&gt;
-        * The constant ${element.getName()}.\n
-&lt;#else&gt;
-        * The ${name}.\n
-&lt;/#if&gt; */</VALUE>
-        </FIELD>
-        <FIELD>
-          <KEY>.+</KEY>
-          <VALUE>/**\n
-    &lt;#if element.parent.isEnum()&gt;
-        *${name} ${typeName}.\n
-&lt;#else&gt;
-        * The ${name}.\n
-&lt;/#if&gt;*/</VALUE>
-        </FIELD>
-      </FIELDS>
-    </TEMPLATES>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml
index 153a060..a203de8 100644
--- a/.idea/libraries/bld.xml
+++ b/.idea/libraries/bld.xml
@@ -15,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>
\ No newline at end of file
diff --git a/.idea/libraries/test.xml b/.idea/libraries/test.xml
index 5445790..05f52ce 100644
--- a/.idea/libraries/test.xml
+++ b/.idea/libraries/test.xml
@@ -4,7 +4,6 @@
       <root url="file://$PROJECT_DIR$/lib/test" />
       <root url="file://$PROJECT_DIR$/lib/provided" />
       <root url="file://$PROJECT_DIR$/src/test/resources" />
-      <root url="file://$PROJECT_DIR$/core/src/test/resources" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f22cced..e6cd1a9 100644
--- 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.AkismetBuild" />
@@ -7,27 +6,7 @@
     <pattern value="net.thauvin.erik.AkismetBuild" method="detekt" />
     <pattern value="net.thauvin.erik.AkismetBuild" method="detektBaseline" />
   </component>
-  <component name="PDMPlugin">
-    <option name="customRuleSets">
-      <list>
-        <option value="K:\java\semver\config\pmd.xml" />
-        <option value="$PROJECT_DIR$/../../java/bld-generated-version/config/pmd.xml" />
-        <option value="$PROJECT_DIR$/../../java/bld-pitest/config/pmd.xml" />
-        <option value="$PROJECT_DIR$/../../java/bld-jacoco-report/config/pmd.xml" />
-        <option value="$PROJECT_DIR$/../../java/bld-checkstyle/config/pmd.xml" />
-        <option value="$PROJECT_DIR$/../../java/bld-exec/config/pmd.xml" />
-        <option value="$PROJECT_DIR$/../../java/bld-testng/config/pmd.xml" />
-        <option value="$PROJECT_DIR$/../../java/rife2/bld-checkstyle/config/pmd.xml" />
-        <option value="$PROJECT_DIR$/../../java/rife2/bld-generated-version/config/pmd.xml" />
-        <option value="$PROJECT_DIR$/../../java/rife2/bld-jacoco-report/config/pmd.xml" />
-        <option value="$PROJECT_DIR$/../../java/rife2/bld-testng/config/pmd.xml" />
-        <option value="$PROJECT_DIR$/../../java/rife2/bld-exec/config/pmd.xml" />
-        <option value="$PROJECT_DIR$/../../java/rife2/bld-pitest/config/pmd.xml" />
-      </list>
-    </option>
-    <option name="skipTestSources" value="false" />
-  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build" />
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 354189b..55adcb9 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,6 +2,7 @@
 <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/.idea/runConfigurations/Run Tests.xml b/.idea/runConfigurations/Run Tests.xml
index a0f7cf6..d46a237 100644
--- a/.idea/runConfigurations/Run Tests.xml	
+++ b/.idea/runConfigurations/Run Tests.xml	
@@ -6,4 +6,4 @@
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>