From 44ccd727be9ac92de19cd75f1dc5d77eea2dfd8b Mon Sep 17 00:00:00 2001
From: XDEV Renovate Bot <renovate@xdev-software.de>
Date: Sun, 14 Sep 2025 04:14:19 +0000
Subject: [PATCH 01/18] Update shogo82148/actions-create-release digest to
 7b89596

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0639fc65..61015663 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -91,7 +91,7 @@ jobs:
 
     - name: Create Release
       id: create-release
-      uses: shogo82148/actions-create-release@4661dc54f7b4b564074e9fbf73884d960de569a3 # v1
+      uses: shogo82148/actions-create-release@7b89596097b26731bda0852f1504f813499079ee # v1
       with:
         tag_name: v${{ steps.version.outputs.release }}
         release_name: v${{ steps.version.outputs.release }}

From 088bcf340437d337ffc169567f6bdfaad3a6d2d6 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Mon, 15 Sep 2025 14:54:51 +0200
Subject: [PATCH 02/18] Add PMD 7.16 Rules

---
 .config/pmd/java/ruleset.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.config/pmd/java/ruleset.xml b/.config/pmd/java/ruleset.xml
index 267fa5e9..5d76b2b6 100644
--- a/.config/pmd/java/ruleset.xml
+++ b/.config/pmd/java/ruleset.xml
@@ -153,6 +153,8 @@
 	<rule ref="category/java/errorprone.xml/MisplacedNullCheck"/>
 	<rule ref="category/java/errorprone.xml/MoreThanOneLogger"/>
 	<rule ref="category/java/errorprone.xml/NonStaticInitializer"/>
+	<rule ref="category/java/errorprone.xml/ReplaceJavaUtilCalendar"/>
+	<rule ref="category/java/errorprone.xml/ReplaceJavaUtilDate"/>
 	<rule ref="category/java/errorprone.xml/ReturnFromFinallyBlock"/>
 	<rule ref="category/java/errorprone.xml/SingletonClassReturningNewInstance"/>
 	<rule ref="category/java/errorprone.xml/UnconditionalIfStatement"/>

From dd4c7faeec7695b3b9d02cff6dbc674f9cdd582b Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 16 Sep 2025 10:26:07 +0200
Subject: [PATCH 03/18] Update mvnw

---
 .mvn/wrapper/maven-wrapper.properties | 18 +------
 mvnw                                  | 67 ++++++++++++++++++++++-----
 mvnw.cmd                              | 57 ++++++++++++++++++++---
 3 files changed, 108 insertions(+), 34 deletions(-)

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 6a6b8b2c..c0bcafe9 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,17 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
+wrapperVersion=3.3.4
+distributionType=only-script
 distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
diff --git a/mvnw b/mvnw
index 08303327..bd8896bf 100755
--- a/mvnw
+++ b/mvnw
@@ -19,7 +19,7 @@
 # ----------------------------------------------------------------------------
 
 # ----------------------------------------------------------------------------
-# Apache Maven Wrapper startup batch script, version 3.3.0
+# Apache Maven Wrapper startup batch script, version 3.3.4
 #
 # Optional ENV vars
 # -----------------
@@ -97,14 +97,25 @@ die() {
   exit 1
 }
 
+trim() {
+  # MWRAPPER-139:
+  #   Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
+  #   Needed for removing poorly interpreted newline sequences when running in more
+  #   exotic environments such as mingw bash on Windows.
+  printf "%s" "${1}" | tr -d '[:space:]'
+}
+
+scriptDir="$(dirname "$0")"
+scriptName="$(basename "$0")"
+
 # parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
 while IFS="=" read -r key value; do
   case "${key-}" in
-  distributionUrl) distributionUrl="${value-}" ;;
-  distributionSha256Sum) distributionSha256Sum="${value-}" ;;
+  distributionUrl) distributionUrl=$(trim "${value-}") ;;
+  distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
   esac
-done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties"
-[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties"
+done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties"
+[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
 
 case "${distributionUrl##*/}" in
 maven-mvnd-*bin.*)
@@ -122,7 +133,7 @@ maven-mvnd-*bin.*)
   distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
   ;;
 maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
-*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
+*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
 esac
 
 # apply MVNW_REPOURL and calculate MAVEN_HOME
@@ -131,7 +142,8 @@ esac
 distributionUrlName="${distributionUrl##*/}"
 distributionUrlNameMain="${distributionUrlName%.*}"
 distributionUrlNameMain="${distributionUrlNameMain%-bin}"
-MAVEN_HOME="$HOME/.m2/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
+MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
+MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
 
 exec_maven() {
   unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
@@ -199,7 +211,7 @@ elif set_java_home; then
 	  public static void main( String[] args ) throws Exception
 	  {
 	    setDefault( new Downloader() );
-	    java.nio.file.Files.copy( new java.net.URL( args[0] ).openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
+	    java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
 	  }
 	}
 	END
@@ -218,7 +230,7 @@ if [ -n "${distributionSha256Sum-}" ]; then
     echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
     exit 1
   elif command -v sha256sum >/dev/null; then
-    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then
       distributionSha256Result=true
     fi
   elif command -v shasum >/dev/null; then
@@ -243,8 +255,41 @@ if command -v unzip >/dev/null; then
 else
   tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
 fi
-printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url"
-mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
+
+# Find the actual extracted directory name (handles snapshots where filename != directory name)
+actualDistributionDir=""
+
+# First try the expected directory name (for regular distributions)
+if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then
+  if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then
+    actualDistributionDir="$distributionUrlNameMain"
+  fi
+fi
+
+# If not found, search for any directory with the Maven executable (for snapshots)
+if [ -z "$actualDistributionDir" ]; then
+  # enable globbing to iterate over items
+  set +f
+  for dir in "$TMP_DOWNLOAD_DIR"/*; do
+    if [ -d "$dir" ]; then
+      if [ -f "$dir/bin/$MVN_CMD" ]; then
+        actualDistributionDir="$(basename "$dir")"
+        break
+      fi
+    fi
+  done
+  set -f
+fi
+
+if [ -z "$actualDistributionDir" ]; then
+  verbose "Contents of $TMP_DOWNLOAD_DIR:"
+  verbose "$(ls -la "$TMP_DOWNLOAD_DIR")"
+  die "Could not find Maven distribution directory in extracted archive"
+fi
+
+verbose "Found extracted Maven distribution directory: $actualDistributionDir"
+printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url"
+mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
 
 clean || :
 exec_maven "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
index 136e686a..92450f93 100644
--- a/mvnw.cmd
+++ b/mvnw.cmd
@@ -19,7 +19,7 @@
 @REM ----------------------------------------------------------------------------
 
 @REM ----------------------------------------------------------------------------
-@REM Apache Maven Wrapper startup batch script, version 3.3.0
+@REM Apache Maven Wrapper startup batch script, version 3.3.4
 @REM
 @REM Optional ENV vars
 @REM   MVNW_REPOURL - repo url base for downloading maven distribution
@@ -40,7 +40,7 @@
 @SET __MVNW_ARG0_NAME__=
 @SET MVNW_USERNAME=
 @SET MVNW_PASSWORD=
-@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*)
+@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*)
 @echo Cannot start maven from wrapper >&2 && exit /b 1
 @GOTO :EOF
 : end batch / begin powershell #>
@@ -73,13 +73,30 @@ switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
 # apply MVNW_REPOURL and calculate MAVEN_HOME
 # maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
 if ($env:MVNW_REPOURL) {
-  $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" }
-  $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')"
+  $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" }
+  $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')"
 }
 $distributionUrlName = $distributionUrl -replace '^.*/',''
 $distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
-$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
-$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
+
+$MAVEN_M2_PATH = "$HOME/.m2"
+if ($env:MAVEN_USER_HOME) {
+  $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME"
+}
+
+if (-not (Test-Path -Path $MAVEN_M2_PATH)) {
+    New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null
+}
+
+$MAVEN_WRAPPER_DISTS = $null
+if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) {
+  $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists"
+} else {
+  $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists"
+}
+
+$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain"
+$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
 $MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
 
 if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
@@ -131,7 +148,33 @@ if ($distributionSha256Sum) {
 
 # unzip and move
 Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
-Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null
+
+# Find the actual extracted directory name (handles snapshots where filename != directory name)
+$actualDistributionDir = ""
+
+# First try the expected directory name (for regular distributions)
+$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain"
+$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD"
+if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) {
+  $actualDistributionDir = $distributionUrlNameMain
+}
+
+# If not found, search for any directory with the Maven executable (for snapshots)
+if (!$actualDistributionDir) {
+  Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object {
+    $testPath = Join-Path $_.FullName "bin/$MVN_CMD"
+    if (Test-Path -Path $testPath -PathType Leaf) {
+      $actualDistributionDir = $_.Name
+    }
+  }
+}
+
+if (!$actualDistributionDir) {
+  Write-Error "Could not find Maven distribution directory in extracted archive"
+}
+
+Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir"
+Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null
 try {
   Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
 } catch {

From 108486865e6442363bbcaff9b394ba5b36a2d63f Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Mon, 15 Sep 2025 15:03:03 +0200
Subject: [PATCH 04/18] PMD: Import and modify rules from `jPinpoint`

See https://github.com/jborgers/PMD-jPinpoint-rules
---
 .config/pmd/java/ruleset.xml | 824 ++++++++++++++++++++++++++++++++++-
 1 file changed, 818 insertions(+), 6 deletions(-)

diff --git a/.config/pmd/java/ruleset.xml b/.config/pmd/java/ruleset.xml
index 5d76b2b6..28bc272e 100644
--- a/.config/pmd/java/ruleset.xml
+++ b/.config/pmd/java/ruleset.xml
@@ -11,7 +11,6 @@
 	<!-- Only rules that don't overlap with CheckStyle! -->
 
 	<rule ref="category/java/bestpractices.xml/AvoidPrintStackTrace"/>
-	<rule ref="category/java/bestpractices.xml/AvoidStringBufferField"/>
 	<rule ref="category/java/bestpractices.xml/AvoidUsingHardCodedIP"/>
 	<rule ref="category/java/bestpractices.xml/ConstantsInInterface"/>
 	<rule ref="category/java/bestpractices.xml/ExhaustiveSwitchHasDefault"/>
@@ -199,6 +198,33 @@
 
 	<rule ref="category/java/security.xml"/>
 
+
+	<rule name="AvoidStringBuilderOrBuffer"
+		language="java"
+		message="StringBuilder/ should not be used"
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			Usually all cases where `StringBuilder` (or the outdated `StringBuffer`) is used are either due to confusing (legacy) logic or may be replaced by a simpler string concatenation.
+
+			Solution:
+			* Do not use `StringBuffer` because it's thread-safe and usually this is not needed
+			* If `StringBuilder` is only used in a simple method (like `toString`) and is effectively inlined: Use a simpler string concatenation (`"a" + x + "b"`). This will be optimized by the Java compiler internally.
+			* In all other cases: 
+			  * Check what is happening and if it makes ANY sense! If for example a CSV file is built here consider using a proper library instead!
+			  * Abstract the Strings into a DTO, join them together using a collection (or `StringJoiner`) or use Java's Streaming API instead
+		</description>
+		<priority>3</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+<![CDATA[
+//ConstructorCall/ClassType[pmd-java:typeIs('java.lang.StringBuffer') or pmd-java:typeIs('java.lang.StringBuilder')]
+]]>
+				</value>
+			</property>
+		</properties>
+	</rule>
+
 	<rule name="AvoidSystemSetterCall"
 		language="java"
 		message="Setters of java.lang.System should not be called unless really needed"
@@ -214,7 +240,7 @@
 		<properties>
 			<property name="xpath">
 				<value>
-					<![CDATA[
+<![CDATA[
 //MethodCall[starts-with(@MethodName,'set')]/TypeExpression[pmd-java:typeIsExactly('java.lang.System')]
 ]]>
 				</value>
@@ -236,7 +262,7 @@
 		<properties>
 			<property name="xpath">
 				<value>
-					<![CDATA[
+<![CDATA[
 //MethodDeclaration[pmd-java:hasAnnotation('jakarta.annotation.PostConstruct')]
 ]]>
 				</value>
@@ -257,7 +283,7 @@
 		<properties>
 			<property name="xpath">
 				<value>
-					<![CDATA[
+<![CDATA[
 //MethodDeclaration[pmd-java:hasAnnotation('jakarta.annotation.PreDestroy')]
 ]]>
 				</value>
@@ -279,7 +305,7 @@
 		<properties>
 			<property name="xpath">
 				<value>
-					<![CDATA[
+<![CDATA[
 //MethodCall[pmd-java:matchesSig('java.lang.Thread#start()') or pmd-java:matchesSig('java.lang.Thread#startVirtualThread(java.lang.Runnable)') or pmd-java:matchesSig('java.lang.Thread$Builder#start(java.lang.Runnable)')]
 ]]>
 				</value>
@@ -303,7 +329,7 @@
 		<properties>
 			<property name="xpath">
 				<value>
-					<![CDATA[
+<![CDATA[
 //ClassDeclaration[@Interface = false()]/ClassBody/FieldDeclaration/VariableDeclarator/VariableId[@Name='serialVersionUID'] |
 //ConstructorCall/ClassType[pmd-java:typeIsExactly('java.io.ObjectInputStream') or pmd-java:typeIsExactly('java.io.ObjectOutputStream')]
 ]]>
@@ -311,4 +337,790 @@
 			</property>
 		</properties>
 	</rule>
+
+	<!-- Vaadin -->
+	<!-- For future reference: This should maybe be extracted into a ruleset if there are more Vaadin specific rules -->
+	<rule name="VaadinNativeHTMLIsUnsafe"
+		language="java"
+		message="Unescaped native HTML is unsafe and will result in XSS vulnerabilities"
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule" >
+		<description>
+			Do not use native HTML! Use Vaadin layouts and components to create required structure.
+			If you are 100% sure that you escaped the value properly and you have no better options you can suppress this.
+		</description>
+		<priority>2</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+<![CDATA[
+//ConstructorCall[pmd-java:typeIs('com.vaadin.flow.component.Html')] |
+//MethodCall[@MethodName='setAttribute' and //ImportDeclaration[starts-with(@PackageName,'com.vaadin')]]/ArgumentList/StringLiteral[1][contains(lower-case(@Image),'html')]
+]]>
+				</value>
+			</property>
+		</properties>
+	</rule>
+
+
+	<!-- Rules from JPinPoint with slight modifications -->
+	<!-- https://github.com/jborgers/PMD-jPinpoint-rules -->
+	<!-- Licensed under Apache-2.0 -->
+	<rule name="AvoidDecimalAndChoiceFormatAsField"
+		language="java"
+		message="Avoid using DecimalFormat or ChoiceFormat as field since it is thread-unsafe"
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			java.text.NumberFormat: DecimalFormat and ChoiceFormat are thread-unsafe.
+
+			Solution: Create a new local one when needed in a method.
+		</description>
+		<priority>1</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+<![CDATA[
+//FieldDeclaration/ClassType[pmd-java:typeIs('java.text.NumberFormat')]
+]]>
+				</value>
+			</property>
+		</properties>
+		<example>
+<![CDATA[
+public class Foo {
+	public static final DecimalFormat NUMBER_FORMAT = new DecimalFormat("###.###"); // bad
+
+	public void bar() {
+		NumberFormat format = new DecimalFormat("###.###"); // good
+	}
+}
+]]>
+		</example>
+	</rule>
+
+	<rule name="AvoidImplicitlyRecompilingRegex"
+		language="java"
+		message="Detected possible resource expensive implicit regex pattern compilation"
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			A regular expression is compiled implicitly on every invocation. 
+			Problem: This can be (CPU) expensive, depending on the length of the regular expression.
+
+			Solution: Compile the regex pattern only once and assign it to a private static final Pattern field.
+			java.util.Pattern objects are thread-safe, so they can be shared among threads.
+		</description>
+		<priority>2</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+<![CDATA[
+(:- method calls for non-short regex literals and used fields defined with non-short regex literal, or not defined as field -:)
+//MethodDeclaration//MethodCall[pmd-java:matchesSig('java.lang.String#replaceAll(java.lang.String,java.lang.String)')
+	or pmd-java:matchesSig('java.lang.String#replaceFirst(java.lang.String,java.lang.String)')
+	or pmd-java:matchesSig('java.util.regex.Pattern#matches(java.lang.String,java.lang.CharSequence)')
+	or pmd-java:matchesSig('java.lang.String#split(java.lang.String)')
+	or pmd-java:matchesSig('java.lang.String#matches(java.lang.String)')
+	or pmd-java:matchesSig('java.nio.file.FileSystem#getPathMatcher(java.lang.String)')
+]
+/ArgumentList/*[1][(self::StringLiteral and string-length(@Image) > 5 and
+(matches(@Image, '[\.\$\|\(\)\[\]\{\}\^\?\*\+\\]+')))
+or
+self::VariableAccess and @Name=ancestor::ClassBody[1]/FieldDeclaration/VariableDeclarator[StringLiteral[string-length(@Image) > 5 and
+(matches(@Image, '[\.\$\|\(\)\[\]\{\}\^\?\*\+\\]+'))] or not(StringLiteral)]/VariableId/@Name]
+]]>
+				</value>
+			</property>
+		</properties>
+		<example>
+<![CDATA[
+String bad_replaceInnerLineBreakBySpace() {
+	return text.replaceAll("([^\\.\\n])\\n", "$1 "); // bad
+}
+
+private static final Pattern INNER_LINE_BREAK_PATTERN = Pattern.compile("([^\\.\\n])\\n"); // good
+
+String good_replaceInnerLineBreakBySpace() {
+	return INNER_LINE_BREAK_PATTERN.matcher(text).replaceAll("$1 "); // good
+}
+]]>
+		</example>
+	</rule>
+
+	<!-- CHANGED: Only match parameter-less constructor -->
+	<rule name="AvoidInMemoryStreamingDefaultConstructor"
+		language="java"
+		message="Default buffer capacity is used which usually needs expensive expansions"
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			The default constructor of ByteArrayOutputStream creates a 32 bytes initial capacity and for StringWriter 16 chars. 
+			Such a small buffer as capacity usually needs several expensive expansions.
+
+			Solution: Explicitly declared the buffer size so that an expansion is not needed in most cases. 
+			Typically much larger than 32, e.g. 4096.
+		</description>
+		<priority>2</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+<![CDATA[
+//ConstructorCall[pmd-java:matchesSig('java.io.ByteArrayOutputStream#new()') or pmd-java:matchesSig('java.io.StringWriter#new()')]
+]]>
+				</value>
+			</property>
+		</properties>
+		<example>
+<![CDATA[
+class Bad {
+	public static void bad()  {
+		ByteArrayOutputStream baos = new ByteArrayOutputStream(); //bad
+		StringWriter sw = new StringWriter(); //bad
+		baos = new ByteArrayOutputStream(32); //bad - not larger than default
+	}
+}
+class Good {
+	public static void good()  {
+		ByteArrayOutputStream baos = new ByteArrayOutputStream(8192); // 8 kiB
+		StringWriter sw = new StringWriter(2048);
+	}
+}
+]]>
+		</example>
+	</rule>
+
+	<rule name="AvoidReStreamingEnumValues"
+		language="java"
+		message="Avoid re-streaming enum values to find a value by a field"
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			The time to find element is O(n); n = the number of enum values. 
+			This identical processing is executed for every call. 
+			Considered problematic when `n > 3`.
+
+			Solution: Use a static field-to-enum-value Map. Access time is O(1), provided the hashCode is well-defined.
+			Implement a fromString method to provide the reverse conversion by using the map.
+			</description>
+		<priority>3</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+<![CDATA[
+//EnumDeclaration/EnumBody[count(EnumConstant) > 3]//MethodDeclaration/Block
+	//MethodCall[pmd-java:matchesSig('java.util.stream.Stream#findFirst()') or pmd-java:matchesSig('java.util.stream.Stream#findAny()')]
+	[//MethodCall[pmd-java:matchesSig('java.util.stream.Stream#of(_)') or pmd-java:matchesSig('java.util.Arrays#stream(_)')]
+	[ArgumentList/MethodCall[pmd-java:matchesSig('_#values()')]]]
+]]>
+				</value>
+			</property>
+		</properties>
+		<example>
+<![CDATA[
+// BAD
+public enum Fruit {
+	APPLE("apple"),
+	ORANGE("orange"),
+	BANANA("banana"),
+	KIWI("kiwi");
+
+	private final String name;
+
+	Fruit(String name) { this.name = name; }
+	@Override public String toString() { return name; }
+	public static Optional<Fruit> fromString(String name) {
+		return Stream.of(values()).filter(v -> v.toString().equals(name)).findAny(); // bad: iterates for every call, O(n) access time
+	}
+}
+
+Usage: `Fruit f = Fruit.fromString("banana");`
+
+// GOOD
+public enum Fruit {
+	APPLE("apple"),
+	ORANGE("orange"),
+	BANANA("banana"),
+	KIWI("kiwi");
+
+	private static final Map<String, Fruit> nameToValue =
+			Stream.of(values()).collect(toMap(Object::toString, v -> v));
+	private final String name;
+
+	Fruit(String name) { this.name = name; }
+	@Override public String toString() { return name; }
+	public static Optional<Fruit> fromString(String name) {
+		return Optional.ofNullable(nameToValue.get(name)); // good, get from Map, O(1) access time
+	}
+}
+]]>
+		</example>
+	</rule>
+
+	<rule name="AvoidRecompilingPatterns"
+		language="java"
+		message="Pattern.compile is used in a method. Compiling a regex pattern can be expensive, make it a static final field."
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			A regular expression is compiled on every invocation. 
+			Problem: this can be expensive, depending on the length of the regular expression.
+
+			Solution: Usually a pattern is a literal, not dynamic and can be compiled only once. Assign it to a private static field. 
+			java.util.Pattern objects are thread-safe so they can be shared among threads.
+			</description>
+		<priority>2</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+<![CDATA[
+//MethodDeclaration//MethodCall[pmd-java:matchesSig('java.util.regex.Pattern#compile(java.lang.String)')
+and not(.//VariableAccess[@Name = ancestor::MethodDeclaration//FormalParameter/VariableId/@Name])]
+]]>
+				</value>
+			</property>
+		</properties>
+		<example>
+<![CDATA[
+class Bad {
+public static final String STR_PAT1 = "[A-Z][a-z]+";
+
+public static void bad() {
+	Pattern p1 = Pattern.compile(STR_PAT1); // bad
+	Pattern p2 = Pattern.compile("(?=\\p{Lu})"); // bad
+	boolean b = p1.matcher("Start ").matches();
+}
+}
+class Good {
+public static final Pattern PAT1 = Pattern.compile("[A-Z][a-z]+");
+public static final Pattern PAT2 = Pattern.compile("(?=\\p{Lu})");
+
+public static void good() {
+	boolean b = PAT1.matcher("Start ").matches();
+}
+}
+]]>
+		</example>
+	</rule>
+
+	<!-- CHANGED: Removed joda time -->
+	<rule name="AvoidRecreatingDateTimeFormatter"
+		language="java"
+		message="Avoid expensive recreation of DateTimeFormatter"
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			Recreating a DateTimeFormatter is relatively expensive.
+
+			Solution: Java 8+ java.time.DateTimeFormatter is thread-safe and can be shared among threads. 
+			Create the formatter from a pattern only once, to initialize a static final field.
+		</description>
+		<priority>2</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+<![CDATA[
+//FieldDeclaration
+[ClassType[pmd-java:typeIs('java.time.format.DateTimeFormatter')]]
+[(not(pmd-java:modifiers() = 'static') and VariableDeclarator[@Initializer=true()]) or not(pmd-java:modifiers() = 'final')]
+|
+//(MethodDeclaration|ConstructorDeclaration)//MethodCall[((pmd-java:matchesSig('java.time.format.DateTimeFormatter#ofPattern(_)'))
+and not(ArgumentList/VariableAccess/@Name = ancestor::Block/..//FormalParameter/VariableId/@Name))
+or pmd-java:matchesSig('java.time.format.DateTimeFormatterBuilder#toFormatter()')
+or pmd-java:matchesSig('java.time.format.DateTimeFormatterBuilder#toFormatter(_)')
+]
+]]>
+				</value>
+			</property>
+		</properties>
+	</rule>
+
+	<rule name="AvoidRecreatingSecurityProviders"
+		language="java"
+		message="Avoid expensive recreation of security providers"
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			Creating a security provider is expensive because of loading of algorithms and other classes. 
+			Additionally, it uses synchronized which leads to lock contention when used with multiple threads.
+
+			Solution: This only needs to happen once in the JVM lifetime, because once loaded the provider is typically available from the Security class. 
+			Create the security provider only once: Only in case when it's not yet available from the Security class.
+		</description>
+		<priority>2</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+<![CDATA[
+//MethodDeclaration
+[not((@Name='main' and @Static=true())or ModifierList/Annotation/@SimpleName='PostConstruct'
+	or .//IfStatement//InfixExpression
+		[@Operator='=='][VariableAccess[pmd-java:typeIs('java.security.Provider')] and NullLiteral]
+)]
+//ConstructorCall[pmd-java:typeIs('java.security.Provider') or pmd-java:typeIs('org.bouncycastle.jce.provider.BouncyCastleProvider')]
+]]>
+				</value>
+			</property>
+		</properties>
+		<example>
+<![CDATA[
+import java.security.*;
+import javax.crypto.*;
+import org.bouncycastle.jce.provider.*;
+
+class Foo {
+	public Cipher initBlowfishBad() throws GeneralSecurityException {
+		Security.addProvider(new BouncyCastleProvider()); // bad
+		// build a Cipher
+	}
+
+	public Cipher initBlowfishGood() throws GeneralSecurityException {
+		Provider bouncyCastleProvider = Security.getProvider(BouncyCastleProvider.PROVIDER_NAME);
+		if (bouncyCastleProvider == null) {
+			bouncyCastleProvider = new BouncyCastleProvider();
+			Security.addProvider(bouncyCastleProvider);
+		}
+		// build a Cipher
+	}
+}
+]]>
+		</example>
+	</rule>
+
+	<rule name="AvoidReflectionInToStringAndHashCode"
+		language="java"
+		message="Expensive Reflection is used"
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			Reflection is relatively expensive.
+
+			Solution: Avoid reflection. Use the non-reflective, explicit way like generation by IDE.
+		</description>
+		<priority>2</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+<![CDATA[
+//MethodCall[starts-with(@MethodName, 'reflection')][(TypeExpression|ConstructorCall)
+	[pmd-java:typeIs('org.apache.commons.lang3.builder.EqualsBuilder') or pmd-java:typeIs('org.apache.commons.lang3.builder.HashCodeBuilder')]]
+]]>
+				</value>
+			</property>
+		</properties>
+		<example>
+<![CDATA[
+class Bad {
+	private int state;
+
+	public boolean equals(Object o) {
+		return EqualsBuilder.reflectionEquals(o, this); // bad
+	}
+}
+
+class Good {
+	private int state;
+
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (!(o instanceof Good)) return false;
+		return new EqualsBuilder().append(((Good)o).state, state).isEquals();
+	}
+}
+]]>
+		</example>
+	</rule>
+
+	<rule name="AvoidSimpleDateFormat"
+		language="java"
+		message="SimpleDateFormat is used. Since it is thread-unsafe, it needs expensive recreation."
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			java.util.SimpleDateFormat is thread-unsafe.
+			The usual solution is to create a new one when needed in a method.
+			Creating SimpleDateFormat is relatively expensive.
+
+			Solution: Use java.time.DateTimeFormatter. These classes are immutable, thus thread-safe and can be made static.
+		</description>
+		<priority>2</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+<![CDATA[
+//ConstructorCall/ClassType[pmd-java:typeIs('java.text.SimpleDateFormat')
+and not ((ancestor::LocalVariableDeclaration/following-sibling::ExpressionStatement/MethodCall|ancestor::MethodCall)
+	[@MethodName='setDateFormat']/VariableAccess[pmd-java:typeIs('com.fasterxml.jackson.databind.ObjectMapper')
+	or pmd-java:typeIs('com.fasterxml.jackson.dataformat.xml.XmlMapper')])
+]
+]]>
+				</value>
+			</property>
+		</properties>
+		<example>
+<![CDATA[
+public class Foo {
+	private String toKeyBad(final Date date) {
+		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); //bad
+		return formatter.format(date);
+	}
+	private String toKeyGood(final LocalDate localDate) {
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); //good
+		return formatter.format(localDate);
+	}
+}
+]]>
+		</example>
+	</rule>
+
+	<rule name="InitializeComparatorOnlyOnce"
+		language="java"
+		message="Avoid creating Comparator instances repeatedly. Initialize them as static final fields instead."
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			Creating Comparator instances repeatedly in methods like compareTo or sort calls is inefficient.
+
+			Solution: Initialize the Comparator once as a static final field and reuse.
+		</description>
+		<priority>2</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+<![CDATA[
+//MethodCall[
+	(pmd-java:matchesSig('java.util.Comparator#comparing(_*)')
+	or pmd-java:matchesSig('java.util.Comparator#comparingInt(_)')
+	or pmd-java:matchesSig('java.util.Comparator#comparingDouble(_)')
+	or pmd-java:matchesSig('java.util.Comparator#comparingLong(_)')
+	or pmd-java:matchesSig('java.util.Comparator#nullsFirst(_)')
+	or pmd-java:matchesSig('java.util.Comparator#nullsLast(_)')
+	or pmd-java:matchesSig('java.util.Comparator#reversed()')
+	)
+	(: not chained: AST is backwards with first call last element :)
+	and not(MethodCall[pmd-java:typeIs('java.util.Comparator')])
+	(: not used as argument to another Comparator method :)
+	and not(parent::ArgumentList/parent::MethodCall[
+		pmd-java:typeIs('java.util.Comparator')
+	])
+	(: used in non-static-final way :)
+	and not(ancestor::FieldDeclaration[pmd-java:modifiers() = ('final') and pmd-java:modifiers() = ('static')])
+]
+]]>
+				</value>
+			</property>
+		</properties>
+		<example>
+<![CDATA[
+public class BadPerson implements Comparable<Person> {
+	@Override
+	public int compareTo(@NotNull Person o) {
+		return Comparator.comparing(Person::getFirstName)  // Bad: Creates new Comparator instance on each invocation
+				.thenComparing(Person::getLastName)
+				.thenComparingInt(Person::getAge)
+				.compare(this, o);
+	}
+}
+
+public class GoodPerson implements Comparable<Person> {
+	private static final Comparator<Person> COMPARE_FIRST_LAST_NAME_AGE =
+		Comparator.comparing(Person::getFirstName)
+			.thenComparing(Person::getLastName)
+			.thenComparingInt(Person::getAge);
+
+	@Override
+	public int compareTo(@NotNull Person o) {
+		return COMPARE_FIRST_LAST_NAME_AGE.compare(this, o);     // Good: Comparator initialized once as static final field
+	}
+}
+]]>
+		</example>
+	</rule>
+
+	<rule name="AvoidCommonPoolForBlockingCalls" 
+		language="java"
+		message="Avoid the ForkJoinPool::commonPool used in parallelStream for blocking calls"
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			Blocking calls, for instance remote calls, may exhaust the common pool for some time thereby blocking all other use of the common pool.
+			In addition, nested use of the common pool can lead to deadlock. Do not use the common pool for blocking calls. 
+			The parallelStream() call uses the common pool.
+
+			Solution: Use a dedicated thread pool with enough threads to get proper parallelism.
+			The number of threads in the common pool is equal to the number of CPUs and meant to utilize all of them.
+			It assumes CPU-intensive non-blocking processing of in-memory data.
+		</description>
+		<priority>2</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+<![CDATA[
+(: assumption: if import of web client / http client is present, parallelStreaming is for remote calls :)
+//ImportDeclaration[@PackageName=('org.springframework.web.client','org.apache.commons.httpclient')]
+/..//MethodCall[
+pmd-java:matchesSig('java.util.Collection#parallelStream()')
+and not(ancestor::ExpressionStatement//MethodCall[pmd-java:matchesSig('java.util.concurrent.ExecutorService#submit(_)')])
+]
+]]>
+				</value>
+			</property>
+		</properties>
+		<example>
+<![CDATA[
+import java.util.concurrent.*;
+import java.util.stream.*;
+import java.util.*;
+import org.springframework.web.client.RestTemplate;
+
+public class Foo {
+	final List<String> list = new ArrayList();
+	final ForkJoinPool myFjPool = new ForkJoinPool(10);
+	final ExecutorService myExePool = Executors.newFixedThreadPool(10);
+
+	void bad1() {
+		list.parallelStream().forEach(elem -> storeDataRemoteCall(elem)); // bad
+	}
+
+	void good1() {
+		CompletableFuture[] futures = list.stream().map(elem -> CompletableFuture.supplyAsync(() -> storeDataRemoteCall(elem), myExePool))
+				.toArray(CompletableFuture[]::new);
+		CompletableFuture.allOf(futures).get(10, TimeUnit.MILLISECONDS));
+	}
+
+	void good2() throws ExecutionException, InterruptedException {
+		myFjPool.submit(() ->
+				list.parallelStream().forEach(elem -> storeDataRemoteCall(elem))
+		).get();
+	}
+
+	String storeDataRemoteCall(String elem) {
+		// do remote call, blocking. We don't use the returned value.
+		RestTemplate tmpl;
+		return "";
+	}
+}
+]]>
+		</example>
+	</rule>
+
+	<rule name="AvoidCommonPoolForFutureAsync"
+		language="java"
+		message="Avoid using the common thread pool for Future.supplyAsync, use a separate pool"
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			Future.supplyAsync is typically used for remote calls. By default, it uses the common pool.
+			The number of threads in the common pool is equal to the number of CPU's, which is suitable for in-memory processing.
+			For I/O, however, this number is typically not suitable because most time is spent waiting for the response and not in CPU.
+			The common pool must not be used for blocking calls.
+
+			Solution: A separate, properly sized, pool of threads (an Executor) should be used for the async calls.	
+		</description>
+		<priority>2</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+<![CDATA[
+//MethodCall[pmd-java:matchesSig('java.util.concurrent.CompletableFuture#supplyAsync(_)')]
+]]>
+				</value>
+			</property>
+		</properties>
+		<example>
+<![CDATA[
+public class Foo {
+	private final ExecutorService asyncPool = Executors.newFixedThreadPool(8);
+
+	void bad() {
+		CompletableFuture<Pair<String, Boolean>>[] futures = accounts.stream()
+		.map(account -> CompletableFuture.supplyAsync(() -> isAccountBlocked(account))) // bad
+		.toArray(CompletableFuture[]::new);
+	}
+
+	void good() {
+		CompletableFuture<Pair<String, Boolean>>[] futures = accounts.stream()
+		.map(account -> CompletableFuture.supplyAsync(() -> isAccountBlocked(account), asyncPool)) // good
+		.toArray(CompletableFuture[]::new);
+	}
+}
+]]>
+		</example>
+	</rule>
+
+	<rule name="AvoidCompletionServiceTake"
+		language="java"
+		message="Avoid CompletionService.take, use poll"
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			`take()` stalls indefinitely in case of hanging threads and consumes a thread.
+
+			Solution: use `poll()` with a timeout value and handle the timeout.
+		</description>
+		<priority>2</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+<![CDATA[
+//MethodCall[pmd-java:matchesSig('java.util.concurrent.CompletionService#take()')]
+]]>
+				</value>
+			</property>
+		</properties>
+		<example>
+<![CDATA[
+public static <T> void collectAllCollectionReplyFromThreads(CompletionService<List<T>> completionService) {
+	try {
+		Future<List<T>> futureLocal = completionService.take(); // bad
+		Future<List<T>> futuresGood = completionService.poll(3, TimeUnit.SECONDS); // good
+		responseCollector.addAll(futuresGood.get(10, TimeUnit.SECONDS)); // good
+	} catch (InterruptedException | ExecutionException e) {
+		LOGGER.error("Error in Thread : {}", e);
+	} catch (TimeoutException e) {
+		LOGGER.error("Timeout in Thread : {}", e);
+	}
+}
+]]>
+		</example>
+	</rule>
+
+	<rule name="AvoidExecutorInvokeWithoutTimeout"
+		language="java"
+		message="Avoid using ExecutorService::invokeAll or invokeAny without a timeout"
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			Stalls indefinitely in case of stalled Callable(s) and consumes threads.
+
+			Solution: Provide a timeout to the invokeAll/invokeAny method and handle the timeout.
+		</description>
+		<priority>2</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+<![CDATA[
+//MethodCall[pmd-java:matchesSig('java.util.concurrent.ExecutorService#invokeAll(_)') or pmd-java:matchesSig('java.util.concurrent.ExecutorService#invokeAny(_)')]
+]]>
+				</value>
+			</property>
+		</properties>
+		<example>
+<![CDATA[
+import java.util.concurrent.*;
+
+class Foo {
+	private List<Future<ServiceResult>> executeTasksBad(Collection<Callable<ServiceResult>> tasks, ExecutorService executor) throws Exception {
+		return executor.invokeAll(tasks); // bad, no timeout
+	}
+	private List<Future<ServiceResult>> executeTasksGood(Collection<Callable<ServiceResult>> tasks, ExecutorService executor) throws Exception {
+		return executor.invokeAll(tasks, OUR_TIMEOUT_IN_MILLIS, TimeUnit.MILLISECONDS); // good
+	}
+}
+]]>
+		</example>
+	</rule>
+
+	<rule name="AvoidFutureGetWithoutTimeout"
+		language="java"
+		message="Avoid future.get without timeout"
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			Stalls indefinitely in case of hanging threads and consumes a thread.
+
+			Solution: Provide a timeout value and handle the timeout.
+		</description>
+		<priority>2</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+<![CDATA[
+//MethodCall[pmd-java:matchesSig('java.util.concurrent.Future#get()')]
+]]>
+				</value>
+			</property>
+		</properties>
+		<example>
+<![CDATA[
+public static String bad(CompletableFuture<String> complFuture) throws Exception {
+	return complFuture.get(); // bad
+}
+
+public static String good(CompletableFuture<String> complFuture) throws Exception {
+	return complFuture.get(10, TimeUnit.SECONDS); // good
+}
+]]>
+		</example>
+	</rule>
+
+	<!-- CHANGED: Changed to HTTPClient5 -->
+	<rule name="AvoidRecreatingHttpClient"
+		language="java"
+		message="An HttpClient is created and combined with request-response"
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			Apache HttpClient with its connection pool and timeouts should be setup once and then used for many requests. 
+			It is quite expensive to create and can only provide the benefits of pooling when reused in all requests for that connection.
+
+			Solution: Create/build HttpClient with proper connection pooling and timeouts once, and then use it for requests.
+		</description>
+		<priority>3</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+<![CDATA[
+//ClassDeclaration[not(pmd-java:hasAnnotation('org.springframework.context.annotation.Configuration'))]
+//MethodDeclaration//MethodCall[
+	pmd-java:matchesSig('org.apache.hc.client5.http.impl.classic.HttpClientBuilder#create()')
+    or pmd-java:matchesSig('org.apache.hc.client5.http.impl.classic.HttpClients#custom()')
+    or pmd-java:matchesSig('org.apache.hc.client5.http.impl.async.HttpAsyncClientBuilder#build()'
+]
+[ancestor::MethodDeclaration//ClassType[pmd-java:typeIs('org.springframework.http.HttpEntity')
+	or pmd-java:typeIs('org.springframework.http.ResponseEntity')]
+]
+]]>
+				</value>
+			</property>
+		</properties>
+		<example>
+			<![CDATA[
+class Foo {
+	ResponseEntity<Object> connectBad(Object req) {
+		HttpEntity<Object> requestEntity = new HttpEntity<>(req);
+
+		HttpClient httpClient = HttpClientBuilder.create().setMaxConnPerRoute(10).build(); // bad
+		return remoteCall(httpClient, requestEntity);
+	}
+}
+]]>
+		</example>
+	</rule>
+
+	<rule name="GsonCreatedForEachMethodCall"
+		language="java"
+		message="A Gson object is created for each method call, which is expensive."
+		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
+		<description>
+			Problem: Gson creation is relatively expensive. A JMH benchmark shows a 24x improvement reusing one instance.
+
+			Solution: Since Gson objects are thread-safe after creation, they can be shared between threads. 
+			So reuse created instances from a static field. 
+			Pay attention to use thread-safe (custom) adapters and serializers.
+		</description>
+		<priority>3</priority>
+		<properties>
+			<property name="xpath">
+				<value>
+<![CDATA[
+//ClassDeclaration[not (pmd-java:hasAnnotation('org.springframework.context.annotation.Configuration'))]//MethodDeclaration/(
+	.//ConstructorCall[pmd-java:typeIs('com.google.gson.Gson')]|
+	.//MethodCall[pmd-java:matchesSig('com.google.gson.GsonBuilder#create()')]//(ConstructorCall|VariableAccess)[pmd-java:typeIs('com.google.gson.GsonBuilder')]
+)
+]]>
+				</value>
+			</property>
+		</properties>
+		<example>
+<![CDATA[
+class Bad {
+	public String toJson(User user) {
+		return new Gson().toJson(user); // bad, new Gson() for each call
+	}
+}
+
+class Good {
+	private static final Gson GSON = new GsonBuilder().serializeNulls().create(); // good
+
+	public String toJson(User user) {
+		return GSON.toJson(user); // good, reuse GSON
+	}
+}
+]]>
+		</example>
+	</rule>
 </ruleset>

From deddd914be12567ecf33146f9a2f7acb0c10fa0a Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 16 Sep 2025 14:36:18 +0200
Subject: [PATCH 05/18] PMD: Exclude unused rule

---
 .config/pmd/java/ruleset.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.config/pmd/java/ruleset.xml b/.config/pmd/java/ruleset.xml
index 28bc272e..517b9243 100644
--- a/.config/pmd/java/ruleset.xml
+++ b/.config/pmd/java/ruleset.xml
@@ -185,6 +185,9 @@
 		<!-- Handled by checkstyle -->
 		<exclude name="RedundantFieldInitializer"/>
 
+		<!-- Not in use and resource intensive -->
+		<exclude name="UseIOStreamsWithApacheCommonsFileItem"/>
+
 		<!-- Nowadays optimized by compiler; No code bloating needed -->
 		<exclude name="UseStringBufferForStringAppends"/>
 	</rule>

From 53b1e5dfd3fc70d91302cfb4fef2dd48b1b65ccb Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 16 Sep 2025 14:36:48 +0200
Subject: [PATCH 06/18] PMD: Reword and also apply to runAsync

---
 .config/pmd/java/ruleset.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.config/pmd/java/ruleset.xml b/.config/pmd/java/ruleset.xml
index 517b9243..cda412b8 100644
--- a/.config/pmd/java/ruleset.xml
+++ b/.config/pmd/java/ruleset.xml
@@ -841,6 +841,8 @@ public class GoodPerson implements Comparable<Person> {
 			Solution: Use a dedicated thread pool with enough threads to get proper parallelism.
 			The number of threads in the common pool is equal to the number of CPUs and meant to utilize all of them.
 			It assumes CPU-intensive non-blocking processing of in-memory data.
+
+			See also: [_Be Aware of ForkJoinPool#commonPool()_](https://dzone.com/articles/be-aware-of-forkjoinpoolcommonpool)
 		</description>
 		<priority>2</priority>
 		<properties>
@@ -897,22 +899,25 @@ public class Foo {
 
 	<rule name="AvoidCommonPoolForFutureAsync"
 		language="java"
-		message="Avoid using the common thread pool for Future.supplyAsync, use a separate pool"
+		message="Avoid using the common thread pool, use a separate pool"
 		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
 		<description>
-			Future.supplyAsync is typically used for remote calls. By default, it uses the common pool.
+			CompletableFuture.supplyAsync/runAsync is typically used for remote calls.
+			By default it uses the common pool.
 			The number of threads in the common pool is equal to the number of CPU's, which is suitable for in-memory processing.
 			For I/O, however, this number is typically not suitable because most time is spent waiting for the response and not in CPU.
 			The common pool must not be used for blocking calls.
 
-			Solution: A separate, properly sized, pool of threads (an Executor) should be used for the async calls.	
+			Solution: A separate, properly sized pool of threads (an Executor) should be used for the async calls.
+
+			See also: [_Be Aware of ForkJoinPool#commonPool()_](https://dzone.com/articles/be-aware-of-forkjoinpoolcommonpool)
 		</description>
 		<priority>2</priority>
 		<properties>
 			<property name="xpath">
 				<value>
 <![CDATA[
-//MethodCall[pmd-java:matchesSig('java.util.concurrent.CompletableFuture#supplyAsync(_)')]
+//MethodCall[pmd-java:matchesSig('java.util.concurrent.CompletableFuture#supplyAsync(_)') or pmd-java:matchesSig('java.util.concurrent.CompletableFuture#runAsync(_)')]
 ]]>
 				</value>
 			</property>

From e6358ed1fa1e6c743e9a7b055a55862beacb8677 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 16 Sep 2025 14:36:56 +0200
Subject: [PATCH 07/18] PMD: Fix error

---
 .config/pmd/java/ruleset.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/pmd/java/ruleset.xml b/.config/pmd/java/ruleset.xml
index cda412b8..bb8177f4 100644
--- a/.config/pmd/java/ruleset.xml
+++ b/.config/pmd/java/ruleset.xml
@@ -1066,7 +1066,7 @@ public static String good(CompletableFuture<String> complFuture) throws Exceptio
 //MethodDeclaration//MethodCall[
 	pmd-java:matchesSig('org.apache.hc.client5.http.impl.classic.HttpClientBuilder#create()')
     or pmd-java:matchesSig('org.apache.hc.client5.http.impl.classic.HttpClients#custom()')
-    or pmd-java:matchesSig('org.apache.hc.client5.http.impl.async.HttpAsyncClientBuilder#build()'
+    or pmd-java:matchesSig('org.apache.hc.client5.http.impl.async.HttpAsyncClientBuilder#build()')
 ]
 [ancestor::MethodDeclaration//ClassType[pmd-java:typeIs('org.springframework.http.HttpEntity')
 	or pmd-java:typeIs('org.springframework.http.ResponseEntity')]

From 042b7a495804644325788e8d174aa2d02622da85 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 16 Sep 2025 14:37:10 +0200
Subject: [PATCH 08/18] PMD: Remove rule as it yields too many FP

---
 .config/pmd/java/ruleset.xml | 63 ------------------------------------
 1 file changed, 63 deletions(-)

diff --git a/.config/pmd/java/ruleset.xml b/.config/pmd/java/ruleset.xml
index bb8177f4..a5b76341 100644
--- a/.config/pmd/java/ruleset.xml
+++ b/.config/pmd/java/ruleset.xml
@@ -766,69 +766,6 @@ public class Foo {
 		</example>
 	</rule>
 
-	<rule name="InitializeComparatorOnlyOnce"
-		language="java"
-		message="Avoid creating Comparator instances repeatedly. Initialize them as static final fields instead."
-		class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
-		<description>
-			Creating Comparator instances repeatedly in methods like compareTo or sort calls is inefficient.
-
-			Solution: Initialize the Comparator once as a static final field and reuse.
-		</description>
-		<priority>2</priority>
-		<properties>
-			<property name="xpath">
-				<value>
-<![CDATA[
-//MethodCall[
-	(pmd-java:matchesSig('java.util.Comparator#comparing(_*)')
-	or pmd-java:matchesSig('java.util.Comparator#comparingInt(_)')
-	or pmd-java:matchesSig('java.util.Comparator#comparingDouble(_)')
-	or pmd-java:matchesSig('java.util.Comparator#comparingLong(_)')
-	or pmd-java:matchesSig('java.util.Comparator#nullsFirst(_)')
-	or pmd-java:matchesSig('java.util.Comparator#nullsLast(_)')
-	or pmd-java:matchesSig('java.util.Comparator#reversed()')
-	)
-	(: not chained: AST is backwards with first call last element :)
-	and not(MethodCall[pmd-java:typeIs('java.util.Comparator')])
-	(: not used as argument to another Comparator method :)
-	and not(parent::ArgumentList/parent::MethodCall[
-		pmd-java:typeIs('java.util.Comparator')
-	])
-	(: used in non-static-final way :)
-	and not(ancestor::FieldDeclaration[pmd-java:modifiers() = ('final') and pmd-java:modifiers() = ('static')])
-]
-]]>
-				</value>
-			</property>
-		</properties>
-		<example>
-<![CDATA[
-public class BadPerson implements Comparable<Person> {
-	@Override
-	public int compareTo(@NotNull Person o) {
-		return Comparator.comparing(Person::getFirstName)  // Bad: Creates new Comparator instance on each invocation
-				.thenComparing(Person::getLastName)
-				.thenComparingInt(Person::getAge)
-				.compare(this, o);
-	}
-}
-
-public class GoodPerson implements Comparable<Person> {
-	private static final Comparator<Person> COMPARE_FIRST_LAST_NAME_AGE =
-		Comparator.comparing(Person::getFirstName)
-			.thenComparing(Person::getLastName)
-			.thenComparingInt(Person::getAge);
-
-	@Override
-	public int compareTo(@NotNull Person o) {
-		return COMPARE_FIRST_LAST_NAME_AGE.compare(this, o);     // Good: Comparator initialized once as static final field
-	}
-}
-]]>
-		</example>
-	</rule>
-
 	<rule name="AvoidCommonPoolForBlockingCalls" 
 		language="java"
 		message="Avoid the ForkJoinPool::commonPool used in parallelStream for blocking calls"

From 6882b45a20f95af079f73e4c989e3a0b1080284e Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Wed, 17 Sep 2025 10:32:54 +0200
Subject: [PATCH 09/18] PMF: Cleanup and format

---
 .config/pmd/java/ruleset.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.config/pmd/java/ruleset.xml b/.config/pmd/java/ruleset.xml
index a5b76341..748c826e 100644
--- a/.config/pmd/java/ruleset.xml
+++ b/.config/pmd/java/ruleset.xml
@@ -448,7 +448,7 @@ String good_replaceInnerLineBreakBySpace() {
 		</example>
 	</rule>
 
-	<!-- CHANGED: Only match parameter-less constructor -->
+	<!-- CHANGED: Only match parameter-less constructor (Optimization) -->
 	<rule name="AvoidInMemoryStreamingDefaultConstructor"
 		language="java"
 		message="Default buffer capacity is used which usually needs expensive expansions"
@@ -500,7 +500,7 @@ class Good {
 
 			Solution: Use a static field-to-enum-value Map. Access time is O(1), provided the hashCode is well-defined.
 			Implement a fromString method to provide the reverse conversion by using the map.
-			</description>
+		</description>
 		<priority>3</priority>
 		<properties>
 			<property name="xpath">
@@ -565,7 +565,7 @@ public enum Fruit {
 
 			Solution: Usually a pattern is a literal, not dynamic and can be compiled only once. Assign it to a private static field. 
 			java.util.Pattern objects are thread-safe so they can be shared among threads.
-			</description>
+		</description>
 		<priority>2</priority>
 		<properties>
 			<property name="xpath">

From 7bcc1bd25b867131f2190e8e86d41f90aa8ada2a Mon Sep 17 00:00:00 2001
From: XDEV Renovate Bot <renovate@xdev-software.de>
Date: Sun, 21 Sep 2025 04:13:51 +0000
Subject: [PATCH 10/18] Update dependency
 org.apache.maven.plugins:maven-javadoc-plugin to v3.12.0

---
 template-placeholder/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml
index 7380883f..89d4aa76 100644
--- a/template-placeholder/pom.xml
+++ b/template-placeholder/pom.xml
@@ -108,7 +108,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.11.3</version>
+				<version>3.12.0</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>

From e0867d36ce22ad168d47ea3c6dd59dfae4db74b4 Mon Sep 17 00:00:00 2001
From: XDEV Renovate Bot <renovate@xdev-software.de>
Date: Mon, 22 Sep 2025 04:19:37 +0000
Subject: [PATCH 11/18] Update dependency
 org.apache.maven.plugins:maven-compiler-plugin to v3.14.1

---
 template-placeholder-demo/pom.xml | 2 +-
 template-placeholder/pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/template-placeholder-demo/pom.xml b/template-placeholder-demo/pom.xml
index 37022223..b6ff1fd9 100644
--- a/template-placeholder-demo/pom.xml
+++ b/template-placeholder-demo/pom.xml
@@ -44,7 +44,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.14.0</version>
+				<version>3.14.1</version>
 				<configuration>
 					<release>${maven.compiler.release}</release>
 					<compilerArgs>
diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml
index 7380883f..f67b5057 100644
--- a/template-placeholder/pom.xml
+++ b/template-placeholder/pom.xml
@@ -97,7 +97,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.14.0</version>
+				<version>3.14.1</version>
 				<configuration>
 					<release>${maven.compiler.release}</release>
 					<compilerArgs>

From 184b908f235cf93fade385838d806417c1ee6564 Mon Sep 17 00:00:00 2001
From: XDEV Renovate Bot <renovate@xdev-software.de>
Date: Mon, 22 Sep 2025 04:19:40 +0000
Subject: [PATCH 12/18] Update dependency
 org.codehaus.mojo:flatten-maven-plugin to v1.7.3

---
 template-placeholder/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml
index 7380883f..e356a34d 100644
--- a/template-placeholder/pom.xml
+++ b/template-placeholder/pom.xml
@@ -147,7 +147,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>flatten-maven-plugin</artifactId>
-						<version>1.7.2</version>
+						<version>1.7.3</version>
 						<configuration>
 							<flattenMode>ossrh</flattenMode>
 						</configuration>

From 0e8aefd14b6e396990ff21fcdd9d0bc0fe7e25b3 Mon Sep 17 00:00:00 2001
From: XDEV Renovate Bot <renovate@xdev-software.de>
Date: Wed, 24 Sep 2025 04:13:23 +0000
Subject: [PATCH 13/18] Update dependency
 org.sonatype.central:central-publishing-maven-plugin to v0.9.0

---
 template-placeholder/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml
index 27a24c8d..4c4214ca 100644
--- a/template-placeholder/pom.xml
+++ b/template-placeholder/pom.xml
@@ -193,7 +193,7 @@
 					<plugin>
 						<groupId>org.sonatype.central</groupId>
 						<artifactId>central-publishing-maven-plugin</artifactId>
-						<version>0.8.0</version>
+						<version>0.9.0</version>
 						<extensions>true</extensions>
 						<configuration>
 							<publishingServerId>sonatype-central-portal</publishingServerId>

From f08c6622dbeb98cc1db48a845335020e361b2814 Mon Sep 17 00:00:00 2001
From: XDEV Renovate Bot <renovate@xdev-software.de>
Date: Mon, 29 Sep 2025 04:14:48 +0000
Subject: [PATCH 14/18] Update dependency com.puppycrawl.tools:checkstyle to
 v11.1.0

---
 pom.xml                      | 2 +-
 template-placeholder/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f824869d..61578c0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>11.0.1</version>
+								<version>11.1.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml
index 4c4214ca..3d8cc2cf 100644
--- a/template-placeholder/pom.xml
+++ b/template-placeholder/pom.xml
@@ -215,7 +215,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>11.0.1</version>
+								<version>11.1.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>

From 6278740ec8418dbe1933b70fbab9c3cf7c3f59e7 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Mon, 29 Sep 2025 13:42:00 +0200
Subject: [PATCH 15/18] Fix broken-links not finding issues on GH CLI v2.79+

Fix https://github.com/xdev-software/base-template/issues/8
---
 .github/workflows/broken-links.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml
index 9493fb8a..436ce503 100644
--- a/.github/workflows/broken-links.yml
+++ b/.github/workflows/broken-links.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Find already existing issue
         id: find-issue
         run: |
-          echo "number=$(gh issue list -l 'bug' -l 'automated' -L 1 -S 'in:title \"Link Checker Report\"' -s 'open' --json 'number' --jq '.[].number')" >> $GITHUB_OUTPUT
+          echo "number=$(gh issue list -l 'bug' -l 'automated' -L 1 -S 'in:title "Link Checker Report"' -s 'open' --json 'number' --jq '.[].number')" >> $GITHUB_OUTPUT
         env:
           GH_TOKEN: ${{ github.token }}
 

From 39c4703001cf7da323fb6b809f1ab733284a536d Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 30 Sep 2025 09:52:34 +0200
Subject: [PATCH 16/18] Test compile with Java 25 & Update docs

---
 .github/workflows/check-build.yml | 2 +-
 CONTRIBUTING.md                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml
index 01f08402..e9757649 100644
--- a/.github/workflows/check-build.yml
+++ b/.github/workflows/check-build.yml
@@ -28,7 +28,7 @@ jobs:
     timeout-minutes: 30
     strategy:
       matrix:
-        java: [17, 21]
+        java: [17, 21, 25]
         distribution: [temurin]
     steps:
     - uses: actions/checkout@v5
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index be2a1863..2c7b0250 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,7 +19,7 @@ We also encourage you to read the [contribution instructions by GitHub](https://
 ### Software Requirements
 You should have the following things installed:
 * Git
-* Java 21 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
+* Java 25 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
 * Maven (Note that the [Maven Wrapper](https://maven.apache.org/wrapper/) is shipped with the repo)
 
 ### Recommended setup

From f71bf683b682ca9d985ee02a13b157676e21cd9f Mon Sep 17 00:00:00 2001
From: XDEV Renovate Bot <renovate@xdev-software.de>
Date: Thu, 2 Oct 2025 04:10:53 +0000
Subject: [PATCH 17/18] Update peter-evans/create-issue-from-file action to v6

---
 .github/workflows/broken-links.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml
index 436ce503..a99ae52c 100644
--- a/.github/workflows/broken-links.yml
+++ b/.github/workflows/broken-links.yml
@@ -37,7 +37,7 @@ jobs:
 
       - name: Create Issue From File
         if: steps.lychee.outputs.exit_code != 0
-        uses: peter-evans/create-issue-from-file@e8ef132d6df98ed982188e460ebb3b5d4ef3a9cd # v5
+        uses: peter-evans/create-issue-from-file@fca9117c27cdc29c6c4db3b86c48e4115a786710 # v6
         with:
           issue-number: ${{ steps.find-issue.outputs.number }}
           title: Link Checker Report

From 046de3916a42b79a547d1a8281de2bc875e9091c Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Thu, 2 Oct 2025 10:47:35 +0200
Subject: [PATCH 18/18] Update PMD scheme location

---
 .config/pmd/java/ruleset.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/pmd/java/ruleset.xml b/.config/pmd/java/ruleset.xml
index 748c826e..6bf58b33 100644
--- a/.config/pmd/java/ruleset.xml
+++ b/.config/pmd/java/ruleset.xml
@@ -2,7 +2,7 @@
 <ruleset name="Default"
 		 xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
 		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+		 xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.github.io/ruleset_2_0_0.xsd">
 
 	<description>
 		This ruleset checks the code for discouraged programming constructs.