From da95ddb4e31db3d59db94ca08ae46ba3f75ecc97 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 23 Nov 2023 12:25:17 +0100
Subject: [PATCH] Use PMD 7.0.0-rc4 for maven-pmd-plugin

---
 .ci/build.sh |  4 ----
 pom.xml      | 14 +++++++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.ci/build.sh b/.ci/build.sh
index ae7280b1b3..c04d3cc489 100755
--- a/.ci/build.sh
+++ b/.ci/build.sh
@@ -323,10 +323,6 @@ function pmd_ci_dogfood() {
     local mpmdVersion=()
     ./mvnw versions:set -DnewVersion="${PMD_CI_MAVEN_PROJECT_VERSION}-dogfood" -DgenerateBackupPoms=false
     sed -i 's/<version>[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}.*<\/version>\( *<!-- pmd.dogfood.version -->\)/<version>'"${PMD_CI_MAVEN_PROJECT_VERSION}"'<\/version>\1/' pom.xml
-    if [ "${PMD_CI_MAVEN_PROJECT_VERSION}" = "7.0.0-SNAPSHOT" ]; then
-        sed -i 's/pmd-dogfood-config\.xml/pmd-dogfood-config7.xml/' pom.xml
-        mpmdVersion=(-Denforcer.skip=true -Dpmd.plugin.version=3.21.1-pmd-7.0.0-SNAPSHOT)
-    fi
     ./mvnw verify --show-version --errors --batch-mode "${PMD_MAVEN_EXTRA_OPTS[@]}" \
         "${mpmdVersion[@]}" \
         -DskipTests \
diff --git a/pom.xml b/pom.xml
index 8ed3a091b2..1f8bdb18a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -441,7 +441,6 @@
                         <targetJdk>1.${java.version}</targetJdk>
                         <rulesets>
                             <ruleset>/net/sourceforge/pmd/pmd-dogfood-config.xml</ruleset>
-                            <ruleset>/net/sourceforge/pmd/pmd7-dogfood-config.xml</ruleset>
                         </rulesets>
                         <excludeRoots>
                             <excludeRoot>target/generated-sources/javacc</excludeRoot>
@@ -455,25 +454,30 @@
                     <dependencies>
                         <!-- Note: we can't use a property for the version here due to https://issues.apache.org/jira/browse/MRELEASE-932 -->
                         <!-- We use the comment "pmd.dogfood.version" as a marker and manually change the version - see .ci/build.sh -->
+                        <dependency>
+                            <groupId>net.sourceforge.pmd</groupId>
+                            <artifactId>pmd-compat6</artifactId>
+                            <version>7.0.0-rc4</version> <!-- pmd.dogfood.version -->
+                        </dependency>
                         <dependency>
                             <groupId>net.sourceforge.pmd</groupId>
                             <artifactId>pmd-core</artifactId>
-                            <version>6.55.0</version> <!-- pmd.dogfood.version -->
+                            <version>7.0.0-rc4</version> <!-- pmd.dogfood.version -->
                         </dependency>
                         <dependency>
                             <groupId>net.sourceforge.pmd</groupId>
                             <artifactId>pmd-java</artifactId>
-                            <version>6.55.0</version> <!-- pmd.dogfood.version -->
+                            <version>7.0.0-rc4</version> <!-- pmd.dogfood.version -->
                         </dependency>
                         <dependency>
                             <groupId>net.sourceforge.pmd</groupId>
                             <artifactId>pmd-jsp</artifactId>
-                            <version>6.55.0</version> <!-- pmd.dogfood.version -->
+                            <version>7.0.0-rc4</version> <!-- pmd.dogfood.version -->
                         </dependency>
                         <dependency>
                             <groupId>net.sourceforge.pmd</groupId>
                             <artifactId>pmd-javascript</artifactId>
-                            <version>6.55.0</version> <!-- pmd.dogfood.version -->
+                            <version>7.0.0-rc4</version> <!-- pmd.dogfood.version -->
                         </dependency>
                         <!-- This contains the dogfood ruleset -->
                         <dependency>