Upgraded to RIFE2 1.7.0

.idea/libraries/bld.xml

@@ -2,11 +2,11 @@
   <library name="bld">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.20.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-1.7.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.20-sources.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-1.7.0-sources.jar!/" />
     </SOURCES>
     <excluded>
       <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

.idea/misc.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="PDMPlugin">
+    <option name="customRuleSets">
+      <list>
+        <option value="K:\java\semver\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">

.vscode/settings.json

@@ -7,7 +7,7 @@
     ],
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.project.referencedLibraries": [
-        "${HOME}/.rife2/dist/rife2-1.5.20.jar",
+        "${HOME}bld-1.7.0-SNAPSHOT.jar",
         "lib/compile/*.jar",
         "lib/runtime/*.jar",
         "lib/test/*.jar"

config/pmd.xml

@@ -9,6 +9,7 @@
         <exclude name="AvoidPrintStackTrace"/>
         <exclude name="JUnit4TestShouldUseTestAnnotation"/>
         <exclude name="JUnitTestContainsTooManyAsserts"/>
+        <exclude name="GuardLogStatement"/>
     </rule>
 
     <rule ref="category/java/bestpractices.xml/MissingOverride">
@@ -18,6 +19,12 @@
         </properties>
     </rule>
 
+    <rule ref="category/java/bestpractices.xml/ReplaceHashtableWithMap">
+        <properties>
+            <property name="violationSuppressXPath" value="//ClassOrInterfaceDeclaration['java.util.Properties']"/>
+        </properties>
+    </rule>
+
 
     <!-- CODE STYLE -->
     <rule ref="category/java/codestyle.xml">
@@ -25,7 +32,6 @@
         <exclude name="ClassNamingConventions"/>
         <exclude name="ConfusingTernary"/>
         <exclude name="CommentDefaultAccessModifier"/>
-        <exclude name="DefaultPackage"/>
         <exclude name="FieldNamingConventions"/>
         <exclude name="LocalVariableCouldBeFinal"/>
         <exclude name="LongVariable"/>
@@ -39,6 +45,12 @@
         <exclude name="UseUnderscoresInNumericLiterals"/>
     </rule>
 
+    <rule ref="category/java/codestyle.xml/UnnecessaryImport">
+        <properties>
+            <property name="violationSuppressRegex" value="Unused (static|.*\.\*).*"/>
+        </properties>
+    </rule>
+
     <!-- DESIGN -->
     <rule ref="category/java/design.xml">
         <exclude name="AvoidCatchingGenericException"/>

lib/bld/bld-wrapper.properties

@@ -3,5 +3,5 @@ bld.downloadExtensionSources=true
 bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.1-SNAPSHOT
 bld.extension-tests=com.uwyn.rife2:bld-tests-badge:1.2.0
 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
-rife2.downloadLocation=
+bld.downloadLocation=
-rife2.version=1.5.20
+bld.version=1.7.0

src/bld/java/rife/render/TemplateRenderersBuild.java

@@ -58,10 +58,10 @@ public class TemplateRenderersBuild extends Project {
         repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS);
 
         scope(compile)
-                .include(dependency("com.uwyn.rife2", "rife2", version(1, 5, 20)));
+                .include(dependency("com.uwyn.rife2", "rife2", version(1, 7, 0)));
         scope(test)
-                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 2)))
+                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 3)))
-                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 2)))
+                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 3)))
                 .include(dependency("org.assertj:assertj-core:3.24.2"));
     }
 

src/main/java/rife/render/RenderUtils.java

@@ -154,7 +154,7 @@ public final class RenderUtils {
                 return StringUtils.encodeHtml(src);
             }
             case "js" -> {
-                return RenderUtils.encodeJs(src);
+                return encodeJs(src);
             }
             case "json" -> {
                 return StringUtils.encodeJson(src);