diff --git a/src/it/MPMD-379-JDK21/invoker.properties b/src/it/MPMD-379-JDK21/invoker.properties
index 03135633..451e64ea 100644
--- a/src/it/MPMD-379-JDK21/invoker.properties
+++ b/src/it/MPMD-379-JDK21/invoker.properties
@@ -18,9 +18,8 @@
 # available toolchains under linux:
 # https://github.com/apache/infrastructure-p6/blob/production/modules/build_nodes/files/toolchains.xml
 
-# the jdk toolchain "21:openjdk" is selected in pom.xml
+# the jdk toolchain "21" is selected in pom.xml
 invoker.toolchain.jdk.version = 21
-invoker.toolchain.jdk.vendor = openjdk
 
 invoker.goals = clean verify
 invoker.buildResult = failure
diff --git a/src/it/MPMD-379-JDK21/pom.xml b/src/it/MPMD-379-JDK21/pom.xml
index 89d97143..d1580654 100644
--- a/src/it/MPMD-379-JDK21/pom.xml
+++ b/src/it/MPMD-379-JDK21/pom.xml
@@ -39,8 +39,7 @@ under the License.
           <artifactId>maven-compiler-plugin</artifactId>
           <version>@compilerPluginVersion@</version>
           <configuration>
-            <target>${javaVersion}</target>
-            <source>${javaVersion}</source>
+            <release>${javaVersion}</release>
           </configuration>
         </plugin>
       </plugins>
@@ -85,7 +84,6 @@ under the License.
           <toolchains>
             <jdk>
               <version>${javaVersion}</version>
-              <vendor>openjdk</vendor>
             </jdk>
           </toolchains>
         </configuration>
diff --git a/src/main/java/org/apache/maven/plugins/pmd/PmdReport.java b/src/main/java/org/apache/maven/plugins/pmd/PmdReport.java
index e781b861..5b3a14c8 100644
--- a/src/main/java/org/apache/maven/plugins/pmd/PmdReport.java
+++ b/src/main/java/org/apache/maven/plugins/pmd/PmdReport.java
@@ -64,18 +64,15 @@
 public class PmdReport extends AbstractPmdReport {
     /**
      * The target JDK to analyze based on. Should match the source used in the compiler plugin.
-     * Valid values depend on the used PMD version. With the default PMD version valid values are
-     * currently <code>1.3</code>, <code>1.4</code>, <code>1.5</code>, <code>1.6</code>, <code>1.7</code>,
-     * <code>1.8</code>, <code>9</code>, <code>10</code>, <code>11</code>, <code>12</code>, <code>13</code>,
-     * <code>14</code>, <code>15</code>, <code>16</code>, <code>17</code>, <code>18</code>, <code>19</code>,
-     * <code>20</code>, <code>21</code>, and <code>22</code>.
+     * Valid values depend on the used PMD version. Most common values are
+     * <code>8</code>, <code>11</code>, <code>17</code>, and <code>21</code>.
      *
-     * <p> You can override the default PMD version by specifying PMD as a dependency,
-     * see <a href="examples/upgrading-PMD-at-runtime.html">Upgrading PMD at Runtime</a>.</p>
-     *
-     * <p> To see the supported Java versions for each PMD version, see
+     * <p>The full list of supported Java versions for each PMD version is available at
      * <a href="https://docs.pmd-code.org/latest/pmd_languages_java.html">Java support (PMD)</a>.</p>
      *
+     * <p>You can override the default PMD version by specifying PMD as a dependency,
+     * see <a href="examples/upgrading-PMD-at-runtime.html">Upgrading PMD at Runtime</a>.</p>
+     *
      * <p>
      *   <b>Note:</b> this parameter is only used if the language parameter is set to <code>java</code>.
      * </p>