From c4262bc592b9e6cb7534b27971211cbb17cfe212 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 08:42:04 +0100
Subject: [PATCH 01/31] Bump maven from 3.9.4 to 3.9.6

---
 .mvn/wrapper/maven-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 8d98d6dd41..4a95a1367b 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

From 28d56c35be3f6bb33a06cb8f31a3ab2b3809ca4e Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 08:59:23 +0100
Subject: [PATCH 02/31] Upgrade various maven plugins

maven-surefire-plugin: 3.0.0-M8 -> 3.2.5
checkstyle: 10.7.0 -> 10.14.0
maven-javadoc-plugin: 3.4.1 -> 3.6.3
maven-assembly-plugin: 3.5.0 -> 3.6.0
maven-dependency-plugin: 3.5.0 -> 3.6.1
maven-release-plugin: 3.0.0-M7 -> 3.0.1
maven-clean-plugin: 3.2.0 -> 3.3.2
build-helper-maven-plugin: 3.3.0 -> 3.5.0
maven-compiler-plugin: 3.10.1 -> 3.12.1
maven-deploy-plugin: 3.1.0 -> 3.1.1
maven-install-plugin: 3.1.0 -> 3.1.1
maven-resources-plugin: 3.3.0 -> 3.3.1
maven-shade-plugin: 3.4.1 -> 3.5.2
exec-maven-plugin: 3.1.0 -> 3.2.0
maven-source-plugin: 3.2.1 -> 3.3.0
maven-enforcer-plugin: 3.2.1 -> 3.4.1
maven-site-plugin: 4.0.0-M4 -> 4.0.0-M13
versions-maven-plugin: 2.14.2 -> 2.16.2
cyclonedx-maven-plugin: 2.7.9 -> 2.7.11
maven-gpg-plugin: 3.0.1 -> 3.1.0
---
 pom.xml | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index 375ed528d3..4ba40b4e63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,12 +96,12 @@
         <dokka.version>1.7.20</dokka.version>
 
         <javacc.version>5.0</javacc.version>
-        <surefire.version>3.0.0-M8</surefire.version>
-        <checkstyle.version>10.7.0</checkstyle.version>
+        <surefire.version>3.2.5</surefire.version>
+        <checkstyle.version>10.14.0</checkstyle.version>
         <checkstyle.plugin.version>3.3.1</checkstyle.plugin.version>
         <pmd.plugin.version>3.21.2</pmd.plugin.version>
         <ant.version>1.10.13</ant.version>
-        <javadoc.plugin.version>3.4.1</javadoc.plugin.version>
+        <javadoc.plugin.version>3.6.3</javadoc.plugin.version>
         <antlr.version>4.9.1</antlr.version>
         <slf4j.version>1.7.36</slf4j.version>
         <saxon.version>10.7</saxon.version>
@@ -164,17 +164,17 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.6.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.6.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>3.0.0-M7</version>
+                    <version>3.0.1</version>
                     <configuration>
                         <releaseProfiles>pmd-release,sign</releaseProfiles>
                         <pushChanges>true</pushChanges>
@@ -187,14 +187,14 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-clean-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.2</version>
                 </plugin>
 
                 <!-- adds kotlin source directories for checkstyle header checks -->
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.5.0</version>
                     <executions>
                         <execution>
                             <id>add-kotlin-source-dir</id>
@@ -257,7 +257,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.10.1</version>
+                    <version>3.12.1</version>
                     <configuration>
                         <release>${java.version}</release>
                     </configuration>
@@ -295,12 +295,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.1.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-install-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.1.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -310,7 +310,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.3.1</version>
                     <configuration>
                         <propertiesEncoding>${project.build.sourceEncoding}</propertiesEncoding>
                     </configuration>
@@ -318,7 +318,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.4.1</version>
+                    <version>3.5.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -356,12 +356,12 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>exec-maven-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.2.1</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -457,7 +457,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.2.1</version>
+                    <version>3.4.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -548,12 +548,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>4.0.0-M4</version>
+                    <version>4.0.0-M13</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.14.2</version>
+                    <version>2.16.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.sonatype.plugins</groupId>
@@ -568,7 +568,7 @@
                 <plugin>
                     <groupId>org.cyclonedx</groupId>
                     <artifactId>cyclonedx-maven-plugin</artifactId>
-                    <version>2.7.9</version>
+                    <version>2.7.11</version>
                 </plugin>
                 <!--This plugin's configuration is used to store Eclipse
                     m2e settings only. It has no influence on the Maven build itself. -->
@@ -1122,7 +1122,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.0.1</version>
+                        <version>3.1.0</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>

From f6d32425109e607e0fc406e10492a53ae57c15df Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 09:37:26 +0100
Subject: [PATCH 03/31] Bump ant from 1.10.13 to 1.10.14

---
 pmd-dist/pom.xml | 6 ++----
 pom.xml          | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml
index 998ed84cf8..754127eed1 100644
--- a/pmd-dist/pom.xml
+++ b/pmd-dist/pom.xml
@@ -93,18 +93,16 @@
                             <goal>copy</goal>
                         </goals>
                         <configuration>
-                            <!-- note: ant 1.9.x is still compatible with java7,
-                                 ant 1.10.x requires java8 -->
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.apache.ant</groupId>
                                     <artifactId>ant</artifactId>
-                                    <version>1.9.16</version>
+                                    <version>${ant.version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.ant</groupId>
                                     <artifactId>ant-launcher</artifactId>
-                                    <version>1.9.16</version>
+                                    <version>${ant.version}</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/ant</outputDirectory>
diff --git a/pom.xml b/pom.xml
index 4ba40b4e63..b264dbb900 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
         <checkstyle.version>10.14.0</checkstyle.version>
         <checkstyle.plugin.version>3.3.1</checkstyle.plugin.version>
         <pmd.plugin.version>3.21.2</pmd.plugin.version>
-        <ant.version>1.10.13</ant.version>
+        <ant.version>1.10.14</ant.version>
         <javadoc.plugin.version>3.6.3</javadoc.plugin.version>
         <antlr.version>4.9.1</antlr.version>
         <slf4j.version>1.7.36</slf4j.version>

From a64b4dc1db8d5661240a388ba67d5b53de4fc115 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 09:37:49 +0100
Subject: [PATCH 04/31] Bump antlr4 from 4.9.1 to 4.9.3

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

diff --git a/pom.xml b/pom.xml
index b264dbb900..4a3da14ad2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@
         <pmd.plugin.version>3.21.2</pmd.plugin.version>
         <ant.version>1.10.14</ant.version>
         <javadoc.plugin.version>3.6.3</javadoc.plugin.version>
-        <antlr.version>4.9.1</antlr.version>
+        <antlr.version>4.9.3</antlr.version>
         <slf4j.version>1.7.36</slf4j.version>
         <saxon.version>10.7</saxon.version>
 

From 6ab2ba8d96086d04741556c7faddc667f2275776 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 09:38:22 +0100
Subject: [PATCH 05/31] Bump saxon-HE from 10.7 to 10.9

Remove old saxon
---
 pom.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4a3da14ad2..9e2e7e4b7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@
         <javadoc.plugin.version>3.6.3</javadoc.plugin.version>
         <antlr.version>4.9.3</antlr.version>
         <slf4j.version>1.7.36</slf4j.version>
-        <saxon.version>10.7</saxon.version>
+        <saxon.version>10.9</saxon.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -758,11 +758,6 @@
                 <artifactId>checker-qual</artifactId>
                 <version>2.5.2</version>
             </dependency>
-            <dependency>
-                <groupId>net.sourceforge.saxon</groupId>
-                <artifactId>saxon</artifactId>
-                <version>9.1.0.8</version>
-            </dependency>
             <dependency>
                 <groupId>net.sf.saxon</groupId>
                 <artifactId>Saxon-HE</artifactId>

From 95d389245c5995bfc1585a2a253de3a8077e0638 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 09:38:37 +0100
Subject: [PATCH 06/31] Bump picocli from 4.7.0 to 4.7.5

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

diff --git a/pom.xml b/pom.xml
index 9e2e7e4b7d..e89fd0397c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -721,7 +721,7 @@
             <dependency>
                 <groupId>info.picocli</groupId>
                 <artifactId>picocli</artifactId>
-                <version>4.7.0</version>
+                <version>4.7.5</version>
             </dependency>
             <dependency>
                 <groupId>me.tongfei</groupId>

From 996bd3fb5b7785919786d056984d0948f1e89037 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 09:39:05 +0100
Subject: [PATCH 07/31] Bump progressbar from 0.9.5 to 0.10.0

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

diff --git a/pom.xml b/pom.xml
index e89fd0397c..bd8a5a0d03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -726,7 +726,7 @@
             <dependency>
                 <groupId>me.tongfei</groupId>
                 <artifactId>progressbar</artifactId>
-                <version>0.9.5</version>
+                <version>0.10.0</version>
             </dependency>
             <dependency>
                 <groupId>org.ow2.asm</groupId>

From 9df7eca80e8f523284858eb97eb9512cafd770f7 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 09:40:08 +0100
Subject: [PATCH 08/31] Bump pcollections from 3.1.3 to 3.2.0

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

diff --git a/pom.xml b/pom.xml
index bd8a5a0d03..a64545b8b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -736,7 +736,7 @@
             <dependency>
                 <groupId>org.pcollections</groupId>
                 <artifactId>pcollections</artifactId>
-                <version>3.1.3</version>
+                <version>3.2.0</version>
             </dependency>
             <dependency>
                 <groupId>net.sourceforge.pmd</groupId>

From 90c08d4790d0b3b14d96087ffb40189665b0e2a5 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 09:40:24 +0100
Subject: [PATCH 09/31] Bump checker-qual from 2.5.2 to 2.11.1

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

diff --git a/pom.xml b/pom.xml
index a64545b8b4..8acfeca849 100644
--- a/pom.xml
+++ b/pom.xml
@@ -756,7 +756,7 @@
             <dependency>
                 <groupId>org.checkerframework</groupId>
                 <artifactId>checker-qual</artifactId>
-                <version>2.5.2</version>
+                <version>2.11.1</version>
             </dependency>
             <dependency>
                 <groupId>net.sf.saxon</groupId>

From 961fae6d1476a482bc6fa5bfae761034cf59c9f4 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 09:40:39 +0100
Subject: [PATCH 10/31] Bump commons-lang3 from 3.8.1 to 3.14.0

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

diff --git a/pom.xml b/pom.xml
index 8acfeca849..a839ab373e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -766,7 +766,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.8.1</version>
+                <version>3.14.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>

From 737672deb1aa04545ac56826183522d19d0e4b5b Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 09:40:52 +0100
Subject: [PATCH 11/31] Bump commons-text from 1.3 to 1.11.0

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

diff --git a/pom.xml b/pom.xml
index a839ab373e..d7e4d92941 100644
--- a/pom.xml
+++ b/pom.xml
@@ -771,7 +771,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-text</artifactId>
-                <version>1.3</version> <!-- 1.3 is still compatible with java7 -->
+                <version>1.11.0</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>

From 07740f17925fbd23648da855061c474f680f360b Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 09:41:06 +0100
Subject: [PATCH 12/31] Bump groovy from 4.0.15 to 4.0.19

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

diff --git a/pom.xml b/pom.xml
index d7e4d92941..d3c3a98b9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -791,7 +791,7 @@
             <dependency>
                 <groupId>org.apache.groovy</groupId>
                 <artifactId>groovy</artifactId>
-                <version>4.0.15</version>
+                <version>4.0.19</version>
             </dependency>
             <dependency>
                 <groupId>com.google.code.gson</groupId>

From bc29e6b7f92204fa850a4e4c80daa99199051b52 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 09:41:21 +0100
Subject: [PATCH 13/31] Bump gson from 2.8.9 to 2.10.1

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

diff --git a/pom.xml b/pom.xml
index d3c3a98b9e..15db78735e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -796,7 +796,7 @@
             <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>
-                <version>2.8.9</version>
+                <version>2.10.1</version>
             </dependency>
             <dependency>
                 <groupId>org.yaml</groupId>

From be33a964d056ab62d2149a24c0a89baded7cd7f9 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 09:42:46 +0100
Subject: [PATCH 14/31] Bump scala-reflect and scala-library from 2.13.12 to
 2.13.13

Used by apexlink
---
 pom.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 15db78735e..235b6ae0cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -809,11 +809,16 @@
                 <version>33.0.0-jre</version>
             </dependency>
 
-            <!-- needed by pmd-apex via apex-link -->
+            <!-- scala-reflect and scala-library needed by pmd-apex via apex-link -->
             <dependency>
                 <groupId>org.scala-lang</groupId>
                 <artifactId>scala-reflect</artifactId>
-                <version>2.13.12</version>
+                <version>2.13.13</version>
+            </dependency>
+            <dependency>
+                <groupId>org.scala-lang</groupId>
+                <artifactId>scala-library</artifactId>
+                <version>2.13.13</version>
             </dependency>
 
             <!-- TEST DEPENDENCIES -->

From 2a7b427b2bd6b6999ab4025d7809f86a94392079 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 09:43:06 +0100
Subject: [PATCH 15/31] Bump junit-platform-suite from 1.9.0-M1 to 1.10.2

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

diff --git a/pom.xml b/pom.xml
index 235b6ae0cd..06829c2a37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -867,7 +867,7 @@
             <dependency>
                 <groupId>org.junit.platform</groupId>
                 <artifactId>junit-platform-suite</artifactId>
-                <version>1.9.0-M1</version>
+                <version>1.10.2</version>
                 <scope>test</scope>
             </dependency>
 

From d38a6766515b3f63394fe2a0ba887cf3bd0e2680 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 09:43:27 +0100
Subject: [PATCH 16/31] Bump byte-buddy from 1.14.9 to 1.14.12

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 06829c2a37..721cdaab27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -905,13 +905,13 @@
             <dependency>
                 <groupId>net.bytebuddy</groupId>
                 <artifactId>byte-buddy</artifactId>
-                <version>1.14.9</version>
+                <version>1.14.12</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>net.bytebuddy</groupId>
                 <artifactId>byte-buddy-agent</artifactId>
-                <version>1.14.9</version>
+                <version>1.14.12</version>
                 <scope>test</scope>
             </dependency>
 

From 4616ab386fd6c77c034ae1a69d1865ca4f74d238 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 09:43:44 +0100
Subject: [PATCH 17/31] Bump jetbrains annotations from 13.0 to 24.1.0

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

diff --git a/pom.xml b/pom.xml
index 721cdaab27..9dd4d9a78a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -993,7 +993,7 @@
             <dependency>
                 <groupId>org.jetbrains</groupId>
                 <artifactId>annotations</artifactId>
-                <version>13.0</version>
+                <version>24.1.0</version>
                 <scope>test</scope>
             </dependency>
 

From 3b2973c83f93c82e0366e69c03d78cb75c33b2dc Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 09:43:59 +0100
Subject: [PATCH 18/31] Bump protobuf-java from 3.16.3 to 3.25.3

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

diff --git a/pom.xml b/pom.xml
index 9dd4d9a78a..c82dc5a0fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1006,7 +1006,7 @@
             <dependency>
                 <groupId>com.google.protobuf</groupId>
                 <artifactId>protobuf-java</artifactId>
-                <version>3.16.3</version>
+                <version>3.25.3</version>
             </dependency>
 
             <!-- Make sure to use the correct version the JUnit5 needs. E.g. 5.8.2 needs 1.8.2

From abae565fd458e66a4c539e629639823ec23b9f3e Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 09:49:23 +0100
Subject: [PATCH 19/31] Bump junit4 from 4.13.1 to 4.13.2

---
 pmd-java/pom.xml | 18 +++++++++++++-----
 pom.xml          | 15 +--------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml
index 0999263c4e..71c6e88d22 100644
--- a/pmd-java/pom.xml
+++ b/pmd-java/pom.xml
@@ -167,11 +167,7 @@
             <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
@@ -266,5 +262,17 @@
             <version>1.2</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hamcrest</groupId>
+                    <artifactId>hamcrest-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index c82dc5a0fe..add4e1730d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -859,7 +859,7 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>5.8.2</version>
+                <version>${junit5.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -878,19 +878,6 @@
                 <scope>test</scope>
             </dependency>
 
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.13.1</version>
-                <scope>test</scope>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.hamcrest</groupId>
-                        <artifactId>hamcrest-core</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>

From ad9e4649c8691c30c40c952c1449ef563fac7d53 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 10:06:29 +0100
Subject: [PATCH 20/31] Move nice-xml-messages to dependency management

---
 pmd-core/pom.xml        | 1 -
 pmd-test-schema/pom.xml | 2 --
 pom.xml                 | 6 ++++++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pmd-core/pom.xml b/pmd-core/pom.xml
index 27b39da16f..4b9a2c2de7 100644
--- a/pmd-core/pom.xml
+++ b/pmd-core/pom.xml
@@ -121,7 +121,6 @@
         <dependency>
             <groupId>com.github.oowekyala.ooxml</groupId>
             <artifactId>nice-xml-messages</artifactId>
-            <version>3.1</version>
         </dependency>
 
         <dependency>
diff --git a/pmd-test-schema/pom.xml b/pmd-test-schema/pom.xml
index c81c7b26dc..da907c0e1a 100644
--- a/pmd-test-schema/pom.xml
+++ b/pmd-test-schema/pom.xml
@@ -45,8 +45,6 @@
         <dependency>
             <groupId>com.github.oowekyala.ooxml</groupId>
             <artifactId>nice-xml-messages</artifactId>
-            <version>3.1</version>
-            <scope>compile</scope>
         </dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml
index add4e1730d..80c3a28d30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -836,6 +836,12 @@
                 <scope>test</scope>
             </dependency>
 
+            <dependency>
+                <groupId>com.github.oowekyala.ooxml</groupId>
+                <artifactId>nice-xml-messages</artifactId>
+                <version>3.1</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.github.oowekyala.treeutils</groupId>
                 <artifactId>tree-matchers</artifactId>

From c8354518f762b14b39460cfd8a6d157952f0ba6b Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 10:07:39 +0100
Subject: [PATCH 21/31] Bump scalameta from 4.8.11 to 4.9.1

---
 pmd-scala-modules/pmd-scala-common/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmd-scala-modules/pmd-scala-common/pom.xml b/pmd-scala-modules/pmd-scala-common/pom.xml
index 1c384420fd..4ed8e83a35 100644
--- a/pmd-scala-modules/pmd-scala-common/pom.xml
+++ b/pmd-scala-modules/pmd-scala-common/pom.xml
@@ -13,7 +13,7 @@
     </parent>
 
     <properties>
-        <scalameta.version>4.8.11</scalameta.version>
+        <scalameta.version>4.9.1</scalameta.version>
     </properties>
 
     <build>

From ac9d7789a0bb845d79bfa80ba2c004798e534dba Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 10:07:57 +0100
Subject: [PATCH 22/31] Bump scala-library from 2.12.18 to 2.12.19

---
 pmd-scala-modules/pmd-scala_2.12/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmd-scala-modules/pmd-scala_2.12/pom.xml b/pmd-scala-modules/pmd-scala_2.12/pom.xml
index df559e02ea..d23b7bdaa9 100644
--- a/pmd-scala-modules/pmd-scala_2.12/pom.xml
+++ b/pmd-scala-modules/pmd-scala_2.12/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
-            <version>${scalaVersion}.18</version>
+            <version>${scalaVersion}.19</version>
         </dependency>
         <dependency>
             <groupId>org.scalameta</groupId>

From 1583a3b1e23004fae701b32277a9e3da732b9b5c Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 10:08:10 +0100
Subject: [PATCH 23/31] Bump scala-library from 2.13.12 to 2.13.13

---
 pmd-scala-modules/pmd-scala_2.13/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmd-scala-modules/pmd-scala_2.13/pom.xml b/pmd-scala-modules/pmd-scala_2.13/pom.xml
index 03a78aeee8..2f8f799873 100644
--- a/pmd-scala-modules/pmd-scala_2.13/pom.xml
+++ b/pmd-scala-modules/pmd-scala_2.13/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
-            <version>${scalaVersion}.12</version>
+            <version>${scalaVersion}.13</version>
         </dependency>
         <dependency>
             <groupId>org.scalameta</groupId>

From 23e227786b81c696343b6b601e40e5e853d7f9b2 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 11:16:29 +0100
Subject: [PATCH 24/31] [scala] Fix tests after scala upgrade

---
 .../pmd/lang/scala/ast/testdata/List.txt      | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.txt b/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.txt
index 18a538a8ff..7512ade684 100644
--- a/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.txt
+++ b/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.txt
@@ -551,17 +551,18 @@
             |     |                          +- LitString
             |     |                          +- LitString
             |     |                          +- TermName
-            |     |                          +- TermApplyInfix
-            |     |                             +- TermName
-            |     |                             +- TermName
-            |     |                             +- TypeArgClause
-            |     |                             +- TermArgClause
-            |     |                                +- TermApplyInfix
-            |     |                                   +- TermName
-            |     |                                   +- TermName
-            |     |                                   +- TypeArgClause
-            |     |                                   +- TermArgClause
-            |     |                                      +- LitInt
+            |     |                          +- TermBlock
+            |     |                             +- TermApplyInfix
+            |     |                                +- TermName
+            |     |                                +- TermName
+            |     |                                +- TypeArgClause
+            |     |                                +- TermArgClause
+            |     |                                   +- TermApplyInfix
+            |     |                                      +- TermName
+            |     |                                      +- TermName
+            |     |                                      +- TypeArgClause
+            |     |                                      +- TermArgClause
+            |     |                                         +- LitInt
             |     +- DefnDef
             |     |  +- ModFinal
             |     |  +- ModOverride

From 7eb9dbeb03c6d5dfb25f7d3d4b330a4eaf538031 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 10:08:42 +0100
Subject: [PATCH 25/31] Bump jsoup from 1.15.3 to 1.17.2

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

diff --git a/pmd-html/pom.xml b/pmd-html/pom.xml
index d5ad36a9e7..6c99408260 100644
--- a/pmd-html/pom.xml
+++ b/pmd-html/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.15.3</version>
+            <version>1.17.2</version>
         </dependency>
 
         <dependency>

From 38d6927589533edf7677f6c24c5e786b59bc34ec Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 10:09:00 +0100
Subject: [PATCH 26/31] Bump log4j from 2.17.1 to 2.23.0

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

diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml
index 71c6e88d22..577ebb198f 100644
--- a/pmd-java/pom.xml
+++ b/pmd-java/pom.xml
@@ -12,7 +12,7 @@
     </parent>
 
     <properties>
-        <log4j.version>2.17.1</log4j.version>
+        <log4j.version>2.23.0</log4j.version>
     </properties>
 
     <build>

From 6323dfb15f7a0b5a21e7be3ef3c22a43a478d23f Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 10:09:14 +0100
Subject: [PATCH 27/31] Bump assertj-core from 3.11.0 to 3.25.3

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

diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml
index 577ebb198f..2c0bc6864c 100644
--- a/pmd-java/pom.xml
+++ b/pmd-java/pom.xml
@@ -253,7 +253,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.11.0</version>
+            <version>3.25.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>

From e76d2a021c9e12397f0f71763c41d61b9784213d Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 11:02:16 +0100
Subject: [PATCH 28/31] [java] Fix JUnitTestsShouldIncludeAssert after assertj
 upgrade

---
 .../pmd/lang/java/rule/internal/TestFrameworksUtil.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/internal/TestFrameworksUtil.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/internal/TestFrameworksUtil.java
index 95a0f5cf50..cbb4c83810 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/internal/TestFrameworksUtil.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/internal/TestFrameworksUtil.java
@@ -181,7 +181,10 @@ public final class TestFrameworksUtil {
     }
 
     private static boolean isSoftAssert(ASTMethodCall call) {
-        return TypeTestUtil.isA("org.assertj.core.api.AbstractSoftAssertions", call.getMethodType().getDeclaringType())
+        JTypeMirror declaringType = call.getMethodType().getDeclaringType();
+        return (TypeTestUtil.isA("org.assertj.core.api.StandardSoftAssertionsProvider", declaringType)
+                || TypeTestUtil.isA("org.assertj.core.api.Java6StandardSoftAssertionsProvider", declaringType)
+                || TypeTestUtil.isA("org.assertj.core.api.AbstractSoftAssertions", declaringType))
             && !"assertAll".equals(call.getMethodName());
     }
 

From b2ed833b662954db39deb4e72e4e0b3ac6c9a47f Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 10:09:26 +0100
Subject: [PATCH 29/31] Bump commons-logging from 1.2 to 1.3.0

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

diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml
index 2c0bc6864c..06731e76d4 100644
--- a/pmd-java/pom.xml
+++ b/pmd-java/pom.xml
@@ -259,7 +259,7 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.2</version>
+            <version>1.3.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

From 92fd84fc383322c28947437aa84cda871716f2da Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 11:47:06 +0100
Subject: [PATCH 30/31] Remove duplicated dependency of guava

---
 pmd-apex/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pmd-apex/pom.xml b/pmd-apex/pom.xml
index f557b122c9..12538bc44d 100644
--- a/pmd-apex/pom.xml
+++ b/pmd-apex/pom.xml
@@ -96,11 +96,6 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>

From f42428b1c1b1e45c2d470dc73da3f6aee072f61f Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 7 Mar 2024 12:26:10 +0100
Subject: [PATCH 31/31] Revert "Bump progressbar from 0.9.5 to 0.10.0"

This reverts commit 996bd3fb5b7785919786d056984d0948f1e89037.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 80c3a28d30..1023a1540d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -726,7 +726,7 @@
             <dependency>
                 <groupId>me.tongfei</groupId>
                 <artifactId>progressbar</artifactId>
-                <version>0.10.0</version>
+                <version>0.9.5</version>
             </dependency>
             <dependency>
                 <groupId>org.ow2.asm</groupId>