Skip to content

Commit f884af3

Browse files
committed
Fixups from review (#144)
1 parent 4aaf0da commit f884af3

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

src/it/MPMD-379-JDK21/invoker.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
# available toolchains under linux:
1919
# https://github.com/apache/infrastructure-p6/blob/production/modules/build_nodes/files/toolchains.xml
2020

21-
# the jdk toolchain "21:openjdk" is selected in pom.xml
21+
# the jdk toolchain "21" is selected in pom.xml
2222
invoker.toolchain.jdk.version = 21
23-
invoker.toolchain.jdk.vendor = openjdk
2423

2524
invoker.goals = clean verify
2625
invoker.buildResult = failure

src/it/MPMD-379-JDK21/pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ under the License.
3939
<artifactId>maven-compiler-plugin</artifactId>
4040
<version>@compilerPluginVersion@</version>
4141
<configuration>
42-
<target>${javaVersion}</target>
43-
<source>${javaVersion}</source>
42+
<release>${javaVersion}</release>
4443
</configuration>
4544
</plugin>
4645
</plugins>
@@ -85,7 +84,6 @@ under the License.
8584
<toolchains>
8685
<jdk>
8786
<version>${javaVersion}</version>
88-
<vendor>openjdk</vendor>
8987
</jdk>
9088
</toolchains>
9189
</configuration>

src/main/java/org/apache/maven/plugins/pmd/PmdReport.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,15 @@
6464
public class PmdReport extends AbstractPmdReport {
6565
/**
6666
* The target JDK to analyze based on. Should match the source used in the compiler plugin.
67-
* Valid values depend on the used PMD version. With the default PMD version valid values are
68-
* currently <code>1.3</code>, <code>1.4</code>, <code>1.5</code>, <code>1.6</code>, <code>1.7</code>,
69-
* <code>1.8</code>, <code>9</code>, <code>10</code>, <code>11</code>, <code>12</code>, <code>13</code>,
70-
* <code>14</code>, <code>15</code>, <code>16</code>, <code>17</code>, <code>18</code>, <code>19</code>,
71-
* <code>20</code>, <code>21</code>, and <code>22</code>.
67+
* Valid values depend on the used PMD version. Most common values are
68+
* <code>8</code>, <code>11</code>, <code>17</code>, and <code>21</code>.
7269
*
73-
* <p> You can override the default PMD version by specifying PMD as a dependency,
74-
* see <a href="examples/upgrading-PMD-at-runtime.html">Upgrading PMD at Runtime</a>.</p>
75-
*
76-
* <p> To see the supported Java versions for each PMD version, see
70+
* <p>The full list of supported Java versions for each PMD version is available at
7771
* <a href="https://docs.pmd-code.org/latest/pmd_languages_java.html">Java support (PMD)</a>.</p>
7872
*
73+
* <p>You can override the default PMD version by specifying PMD as a dependency,
74+
* see <a href="examples/upgrading-PMD-at-runtime.html">Upgrading PMD at Runtime</a>.</p>
75+
*
7976
* <p>
8077
* <b>Note:</b> this parameter is only used if the language parameter is set to <code>java</code>.
8178
* </p>

0 commit comments

Comments
 (0)