This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git
commit 906f1718440461dd59b4260413c7abb82c23fc0b
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sat Dec 3 00:05:15 2022 +0100
Prepare for Doxia 2.0.0
---
pom.xml | 53 ++++++----------------
src/it/MPMD-182/pom.xml | 1 +
src/it/MPMD-205-pmd-js-check/pom.xml | 2 +-
src/it/MPMD-270-325-JDK11/pom.xml | 10 ++--
src/it/MPMD-280-JDK12/pom.xml | 10 ++--
src/it/MPMD-295-JDK13/pom.xml | 10 ++--
src/it/MPMD-302-JDK14/pom.xml | 10 ++--
src/it/MPMD-302-JDK15/pom.xml | 10 ++--
src/it/MPMD-304-toolchain-support/pom.xml | 12 ++---
src/it/MPMD-312-JDK16/pom.xml | 10 ++--
src/it/MPMD-312-JDK17/pom.xml | 10 ++--
src/it/MPMD-323-ruleset-basedir-jgitver/pom.xml | 2 +-
src/it/MPMD-332-JDK18/pom.xml | 10 ++--
src/it/MPMD-348-JDK19/pom.xml | 12 ++---
src/it/MPMD-365-JDK20/pom.xml | 12 ++---
src/it/empty-rulesets/pom.xml | 2 +-
.../maven/plugins/pmd/AbstractPmdReport.java | 13 ++----
.../maven/plugins/pmd/CpdReportGenerator.java | 2 +-
.../maven/plugins/pmd/PmdReportGenerator.java | 6 +--
.../plugins/pmd/AbstractPmdReportTestCase.java | 35 +++++++++++++-
.../apache/maven/plugins/pmd/CpdReportTest.java | 7 ++-
.../plugins/pmd/CpdViolationCheckMojoTest.java | 5 ++
.../apache/maven/plugins/pmd/PmdReportTest.java | 13 ++++--
.../plugins/pmd/PmdViolationCheckMojoTest.java | 5 ++
.../stubs/CustomConfigurationMavenProjectStub.java | 19 ++++++--
.../DefaultConfigurationMavenProjectStub.java | 19 ++++++--
.../pmd/stubs/InvalidFormatMavenProjectStub.java | 19 ++++++--
.../maven/plugins/pmd/stubs/PmdProjectStub.java | 23 ++++++++++
.../cpd-custom-configuration-plugin-config.xml | 1 -
.../cpd-txt-format-configuration-plugin-config.xml | 1 -
.../custom-configuration-plugin-config.xml | 1 -
.../pmd-check-exception-test-plugin-config.xml | 2 +-
.../cpd-default-configuration-plugin-config.xml | 1 -
.../cpd-javascript-plugin-config.xml | 1 -
.../cpd-jsp-plugin-config.xml | 1 -
...-cpd-exclusions-configuration-plugin-config.xml | 1 -
...pd-report-include-xml-in-site-plugin-config.xml | 1 -
.../default-configuration-plugin-config.xml | 1 -
.../javascript-configuration-plugin-config.xml | 1 -
.../jsp-configuration-plugin-config.xml | 1 -
.../pmd-report-custom-rules.xml | 1 -
...md-report-include-xml-in-site-plugin-config.xml | 1 -
...pmd-report-no-render-violations-by-priority.xml | 1 -
...port-not-render-rule-priority-plugin-config.xml | 1 -
...-pmd-exclusions-configuration-plugin-config.xml | 1 -
.../pmd-report-resolve-rulesets.xml | 1 -
.../pmd-with-analysis-cache-plugin-config.xml | 1 -
...with-suppressMarker-no-render-plugin-config.xml | 1 -
.../pmd-with-suppressMarker-plugin-config.xml | 1 -
.../cpd-empty-report-plugin-config.xml | 1 -
.../empty-report/empty-report-plugin-config.xml | 1 -
.../pmd-exclude-roots-plugin-config.xml | 1 -
...md-processing-error-no-report-plugin-config.xml | 1 -
.../pmd-processing-error-skip-plugin-config.xml | 1 -
54 files changed, 206 insertions(+), 163 deletions(-)
diff --git a/pom.xml b/pom.xml
index 551a343..a7dcf6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ under the License.
</parent>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.21.0-SNAPSHOT</version>
+ <version>4.0.0-M1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Maven PMD Plugin</name>
@@ -82,16 +82,14 @@ under the License.
<properties>
<mavenVersion>3.2.5</mavenVersion>
- <doxiaVersion>1.12.0</doxiaVersion>
- <doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
<javaVersion>8</javaVersion>
- <!-- Because PMD 6.35.0+ requires Java 8 -->
<pmdVersion>6.55.0</pmdVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<aetherVersion>1.0.0.v20140518</aetherVersion>
- <sitePluginVersion>3.12.1</sitePluginVersion>
- <projectInfoReportsPluginVersion>3.4.1</projectInfoReportsPluginVersion>
- <jxrPluginVersion>3.3.0</jxrPluginVersion>
+ <compilerPluginVersion>3.11.0</compilerPluginVersion>
+ <sitePluginVersion>4.0.0-M8</sitePluginVersion>
+
<projectInfoReportsPluginVersion>4.0.0-M1-SNAPSHOT</projectInfoReportsPluginVersion>
+ <jxrPluginVersion>4.0.0-M1-SNAPSHOT</jxrPluginVersion>
<project.build.outputTimestamp>2023-01-06T22:00:33Z</project.build.outputTimestamp>
</properties>
@@ -115,6 +113,12 @@ under the License.
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
@@ -186,45 +190,14 @@ under the License.
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-decoration-model</artifactId>
- <version>${doxiaSitetoolsVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-site-renderer</artifactId>
- <version>${doxiaSitetoolsVersion}</version>
- <!--
- Note: doxia-site-renderer needs to be defined AFTER pmd:
- doxia-site-renderer requires transitively dom4j 1.1 which provides a
very old version of jaxen (same jar).
- PMD requires a newer version of jaxen, which is not compatible.
- -->
- <exclusions>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
- </exclusions>
+ <version>2.0.0-M6</version>
</dependency>
<!-- shared -->
- <dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-api</artifactId>
- <version>3.1.1</version>
- </dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-utils</artifactId>
- <version>3.3.4</version>
+ <version>4.0.0-M8</version>
</dependency>
<!-- plexus -->
diff --git a/src/it/MPMD-182/pom.xml b/src/it/MPMD-182/pom.xml
index e4832b5..413851d 100644
--- a/src/it/MPMD-182/pom.xml
+++ b/src/it/MPMD-182/pom.xml
@@ -36,6 +36,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>@compilerPluginVersion@</version>
<configuration>
<source>${javaVersion}</source>
<target>${javaVersion}</target>
diff --git a/src/it/MPMD-205-pmd-js-check/pom.xml
b/src/it/MPMD-205-pmd-js-check/pom.xml
index f3382e1..eb544f9 100644
--- a/src/it/MPMD-205-pmd-js-check/pom.xml
+++ b/src/it/MPMD-205-pmd-js-check/pom.xml
@@ -39,7 +39,7 @@ under the License.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.9.1</version>
+ <version>3.3.0</version>
<executions>
<execution>
<id>add-javascript-source</id>
diff --git a/src/it/MPMD-270-325-JDK11/pom.xml
b/src/it/MPMD-270-325-JDK11/pom.xml
index 296ef7d..ac210b6 100644
--- a/src/it/MPMD-270-325-JDK11/pom.xml
+++ b/src/it/MPMD-270-325-JDK11/pom.xml
@@ -28,7 +28,7 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>11</java.version>
+ <javaVersion>11</javaVersion>
</properties>
<build>
@@ -37,10 +37,10 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
- <target>${java.version}</target>
- <source>${java.version}</source>
+ <target>${javaVersion}</target>
+ <source>${javaVersion}</source>
</configuration>
</plugin>
</plugins>
@@ -57,7 +57,7 @@ under the License.
<failOnViolation>true</failOnViolation>
<failurePriority>4</failurePriority>
<printFailingErrors>true</printFailingErrors>
- <targetJdk>${java.version}</targetJdk>
+ <targetJdk>${javaVersion}</targetJdk>
<minimumTokens>100</minimumTokens>
</configuration>
<executions>
diff --git a/src/it/MPMD-280-JDK12/pom.xml b/src/it/MPMD-280-JDK12/pom.xml
index 071d425..7dcc733 100644
--- a/src/it/MPMD-280-JDK12/pom.xml
+++ b/src/it/MPMD-280-JDK12/pom.xml
@@ -28,7 +28,7 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>12</java.version>
+ <javaVersion>12</javaVersion>
</properties>
<build>
@@ -37,10 +37,10 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
- <target>${java.version}</target>
- <source>${java.version}</source>
+ <target>${javaVersion}</target>
+ <source>${javaVersion}</source>
</configuration>
</plugin>
</plugins>
@@ -57,7 +57,7 @@ under the License.
<failOnViolation>true</failOnViolation>
<failurePriority>4</failurePriority>
<printFailingErrors>true</printFailingErrors>
- <targetJdk>${java.version}</targetJdk>
+ <targetJdk>${javaVersion}</targetJdk>
<minimumTokens>100</minimumTokens>
</configuration>
<executions>
diff --git a/src/it/MPMD-295-JDK13/pom.xml b/src/it/MPMD-295-JDK13/pom.xml
index 5d7e0e5..e3b58e4 100644
--- a/src/it/MPMD-295-JDK13/pom.xml
+++ b/src/it/MPMD-295-JDK13/pom.xml
@@ -28,7 +28,7 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>14</java.version>
+ <javaVersion>14</javaVersion>
</properties>
<build>
@@ -37,10 +37,10 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
- <target>${java.version}</target>
- <source>${java.version}</source>
+ <target>${javaVersion}</target>
+ <source>${javaVersion}</source>
</configuration>
</plugin>
</plugins>
@@ -57,7 +57,7 @@ under the License.
<failOnViolation>true</failOnViolation>
<failurePriority>4</failurePriority>
<printFailingErrors>true</printFailingErrors>
- <targetJdk>${java.version}</targetJdk>
+ <targetJdk>${javaVersion}</targetJdk>
<minimumTokens>100</minimumTokens>
</configuration>
<executions>
diff --git a/src/it/MPMD-302-JDK14/pom.xml b/src/it/MPMD-302-JDK14/pom.xml
index 86f4259..556f9f5 100644
--- a/src/it/MPMD-302-JDK14/pom.xml
+++ b/src/it/MPMD-302-JDK14/pom.xml
@@ -28,7 +28,7 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>14</java.version>
+ <javaVersion>14</javaVersion>
</properties>
<build>
@@ -37,10 +37,10 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
- <target>${java.version}</target>
- <source>${java.version}</source>
+ <target>${javaVersion}</target>
+ <source>${javaVersion}</source>
</configuration>
</plugin>
</plugins>
@@ -57,7 +57,7 @@ under the License.
<failOnViolation>true</failOnViolation>
<failurePriority>4</failurePriority>
<printFailingErrors>true</printFailingErrors>
- <targetJdk>${java.version}</targetJdk>
+ <targetJdk>${javaVersion}</targetJdk>
<minimumTokens>100</minimumTokens>
</configuration>
<executions>
diff --git a/src/it/MPMD-302-JDK15/pom.xml b/src/it/MPMD-302-JDK15/pom.xml
index 6c3514c..119c1a0 100644
--- a/src/it/MPMD-302-JDK15/pom.xml
+++ b/src/it/MPMD-302-JDK15/pom.xml
@@ -28,7 +28,7 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>15</java.version>
+ <javaVersion>15</javaVersion>
</properties>
<build>
@@ -37,10 +37,10 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
- <target>${java.version}</target>
- <source>${java.version}</source>
+ <target>${javaVersion}</target>
+ <source>${javaVersion}</source>
</configuration>
</plugin>
</plugins>
@@ -57,7 +57,7 @@ under the License.
<failOnViolation>true</failOnViolation>
<failurePriority>4</failurePriority>
<printFailingErrors>true</printFailingErrors>
- <targetJdk>${java.version}</targetJdk>
+ <targetJdk>${javaVersion}</targetJdk>
<minimumTokens>100</minimumTokens>
</configuration>
<executions>
diff --git a/src/it/MPMD-304-toolchain-support/pom.xml
b/src/it/MPMD-304-toolchain-support/pom.xml
index c9770a3..f4c9aac 100644
--- a/src/it/MPMD-304-toolchain-support/pom.xml
+++ b/src/it/MPMD-304-toolchain-support/pom.xml
@@ -28,7 +28,7 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>11</java.version>
+ <javaVersion>11</javaVersion>
</properties>
<build>
@@ -37,10 +37,10 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
- <target>${java.version}</target>
- <source>${java.version}</source>
+ <target>${javaVersion}</target>
+ <source>${javaVersion}</source>
</configuration>
</plugin>
</plugins>
@@ -53,7 +53,7 @@ under the License.
<configuration>
<failOnViolation>false</failOnViolation>
<printFailingErrors>true</printFailingErrors>
- <targetJdk>${java.version}</targetJdk>
+ <targetJdk>${javaVersion}</targetJdk>
<minimumTokens>10</minimumTokens>
</configuration>
<executions>
@@ -81,7 +81,7 @@ under the License.
<configuration>
<toolchains>
<jdk>
- <version>${java.version}</version>
+ <version>${javaVersion}</version>
<vendor>oracle</vendor>
</jdk>
</toolchains>
diff --git a/src/it/MPMD-312-JDK16/pom.xml b/src/it/MPMD-312-JDK16/pom.xml
index 0f51ed6..06f97b0 100644
--- a/src/it/MPMD-312-JDK16/pom.xml
+++ b/src/it/MPMD-312-JDK16/pom.xml
@@ -28,7 +28,7 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>16</java.version>
+ <javaVersion>16</javaVersion>
</properties>
<build>
@@ -37,10 +37,10 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
- <target>${java.version}</target>
- <source>${java.version}</source>
+ <target>${javaVersion}</target>
+ <source>${javaVersion}</source>
</configuration>
</plugin>
</plugins>
@@ -57,7 +57,7 @@ under the License.
<failOnViolation>true</failOnViolation>
<failurePriority>4</failurePriority>
<printFailingErrors>true</printFailingErrors>
- <targetJdk>${java.version}</targetJdk>
+ <targetJdk>${javaVersion}</targetJdk>
<minimumTokens>100</minimumTokens>
</configuration>
<executions>
diff --git a/src/it/MPMD-312-JDK17/pom.xml b/src/it/MPMD-312-JDK17/pom.xml
index 0812305..b519c9b 100644
--- a/src/it/MPMD-312-JDK17/pom.xml
+++ b/src/it/MPMD-312-JDK17/pom.xml
@@ -28,7 +28,7 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>17</java.version>
+ <javaVersion>17</javaVersion>
</properties>
<build>
@@ -37,10 +37,10 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
- <target>${java.version}</target>
- <source>${java.version}</source>
+ <target>${javaVersion}</target>
+ <source>${javaVersion}</source>
</configuration>
</plugin>
</plugins>
@@ -57,7 +57,7 @@ under the License.
<failOnViolation>true</failOnViolation>
<failurePriority>4</failurePriority>
<printFailingErrors>true</printFailingErrors>
- <targetJdk>${java.version}</targetJdk>
+ <targetJdk>${javaVersion}</targetJdk>
<minimumTokens>100</minimumTokens>
</configuration>
<executions>
diff --git a/src/it/MPMD-323-ruleset-basedir-jgitver/pom.xml
b/src/it/MPMD-323-ruleset-basedir-jgitver/pom.xml
index 898e891..0c28b51 100644
--- a/src/it/MPMD-323-ruleset-basedir-jgitver/pom.xml
+++ b/src/it/MPMD-323-ruleset-basedir-jgitver/pom.xml
@@ -35,7 +35,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.9.0</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>@project.groupId@</groupId>
diff --git a/src/it/MPMD-332-JDK18/pom.xml b/src/it/MPMD-332-JDK18/pom.xml
index c447a31..76ff3fc 100644
--- a/src/it/MPMD-332-JDK18/pom.xml
+++ b/src/it/MPMD-332-JDK18/pom.xml
@@ -28,7 +28,7 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>18</java.version>
+ <javaVersion>18</javaVersion>
</properties>
<build>
@@ -37,10 +37,10 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
- <target>${java.version}</target>
- <source>${java.version}</source>
+ <target>${javaVersion}</target>
+ <source>${javaVersion}</source>
</configuration>
</plugin>
</plugins>
@@ -57,7 +57,7 @@ under the License.
<failOnViolation>true</failOnViolation>
<failurePriority>4</failurePriority>
<printFailingErrors>true</printFailingErrors>
- <targetJdk>${java.version}</targetJdk>
+ <targetJdk>${javaVersion}</targetJdk>
<minimumTokens>100</minimumTokens>
</configuration>
<executions>
diff --git a/src/it/MPMD-348-JDK19/pom.xml b/src/it/MPMD-348-JDK19/pom.xml
index 8cdbf78..693e2e4 100644
--- a/src/it/MPMD-348-JDK19/pom.xml
+++ b/src/it/MPMD-348-JDK19/pom.xml
@@ -28,7 +28,7 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>19</java.version>
+ <javaVersion>19</javaVersion>
</properties>
<build>
@@ -37,10 +37,10 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.10.1</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
- <target>${java.version}</target>
- <source>${java.version}</source>
+ <target>${javaVersion}</target>
+ <source>${javaVersion}</source>
</configuration>
</plugin>
</plugins>
@@ -57,7 +57,7 @@ under the License.
<failOnViolation>true</failOnViolation>
<failurePriority>4</failurePriority>
<printFailingErrors>true</printFailingErrors>
- <targetJdk>${java.version}</targetJdk>
+ <targetJdk>${javaVersion}</targetJdk>
<minimumTokens>100</minimumTokens>
</configuration>
<executions>
@@ -84,7 +84,7 @@ under the License.
<configuration>
<toolchains>
<jdk>
- <version>${java.version}</version>
+ <version>${javaVersion}</version>
<vendor>openjdk</vendor>
</jdk>
</toolchains>
diff --git a/src/it/MPMD-365-JDK20/pom.xml b/src/it/MPMD-365-JDK20/pom.xml
index 0d04fe2..ccd918e 100644
--- a/src/it/MPMD-365-JDK20/pom.xml
+++ b/src/it/MPMD-365-JDK20/pom.xml
@@ -28,7 +28,7 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>20</java.version>
+ <javaVersion>20</javaVersion>
</properties>
<build>
@@ -37,10 +37,10 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.11.0</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
- <target>${java.version}</target>
- <source>${java.version}</source>
+ <target>${javaVersion}</target>
+ <source>${javaVersion}</source>
</configuration>
</plugin>
</plugins>
@@ -57,7 +57,7 @@ under the License.
<failOnViolation>true</failOnViolation>
<failurePriority>4</failurePriority>
<printFailingErrors>true</printFailingErrors>
- <targetJdk>${java.version}</targetJdk>
+ <targetJdk>${javaVersion}</targetJdk>
<minimumTokens>100</minimumTokens>
</configuration>
<executions>
@@ -84,7 +84,7 @@ under the License.
<configuration>
<toolchains>
<jdk>
- <version>${java.version}</version>
+ <version>${javaVersion}</version>
<vendor>openjdk</vendor>
</jdk>
</toolchains>
diff --git a/src/it/empty-rulesets/pom.xml b/src/it/empty-rulesets/pom.xml
index 9ec4f56..5b6e7d4 100644
--- a/src/it/empty-rulesets/pom.xml
+++ b/src/it/empty-rulesets/pom.xml
@@ -37,7 +37,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java
b/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java
index e3969c8..610fde7 100644
--- a/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java
+++ b/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java
@@ -241,12 +241,6 @@ public abstract class AbstractPmdReport extends
AbstractMavenReport {
// Read-only parameters
// ----------------------------------------------------------------------
- /**
- * The projects in the reactor for aggregation report.
- */
- @Parameter(property = "reactorProjects", readonly = true)
- protected List<MavenProject> reactorProjects;
-
/**
* The current build session instance. This is used for
* toolchain manager API calls and for dependency resolver API calls.
@@ -260,14 +254,15 @@ public abstract class AbstractPmdReport extends
AbstractMavenReport {
/** The files that are being analyzed. */
protected Map<File, PmdFileInfo> filesToProcess;
- /**
- * {@inheritDoc}
- */
@Override
protected MavenProject getProject() {
return project;
}
+ protected List<MavenProject> getReactorProjects() {
+ return reactorProjects;
+ }
+
protected String constructXRefLocation(boolean test) {
String location = null;
if (linkXRef) {
diff --git a/src/main/java/org/apache/maven/plugins/pmd/CpdReportGenerator.java
b/src/main/java/org/apache/maven/plugins/pmd/CpdReportGenerator.java
index dd13594..d95c202 100644
--- a/src/main/java/org/apache/maven/plugins/pmd/CpdReportGenerator.java
+++ b/src/main/java/org/apache/maven/plugins/pmd/CpdReportGenerator.java
@@ -154,7 +154,7 @@ public class CpdReportGenerator {
String code = duplication.getCodefragment();
sink.table();
- sink.tableRows(null, false);
+ sink.tableRows();
sink.tableRow();
sink.tableHeaderCell();
sink.text(bundle.getString("report.cpd.column.file"));
diff --git a/src/main/java/org/apache/maven/plugins/pmd/PmdReportGenerator.java
b/src/main/java/org/apache/maven/plugins/pmd/PmdReportGenerator.java
index bb836c9..43a88d9 100644
--- a/src/main/java/org/apache/maven/plugins/pmd/PmdReportGenerator.java
+++ b/src/main/java/org/apache/maven/plugins/pmd/PmdReportGenerator.java
@@ -149,7 +149,7 @@ public class PmdReportGenerator {
sink.sectionTitle_(level);
sink.table();
- sink.tableRows(null, false);
+ sink.tableRows();
sink.tableRow();
sink.tableHeaderCell();
sink.text(bundle.getString("report.pmd.column.rule"));
@@ -356,7 +356,7 @@ public class PmdReportGenerator {
});
sink.table();
- sink.tableRows(null, false);
+ sink.tableRows();
sink.tableRow();
sink.tableHeaderCell();
sink.text(bundle.getString("report.pmd.suppressedViolations.column.filename"));
@@ -419,7 +419,7 @@ public class PmdReportGenerator {
sink.sectionTitle1_();
sink.table();
- sink.tableRows(null, false);
+ sink.tableRows();
sink.tableRow();
sink.tableHeaderCell();
sink.text(bundle.getString("report.pmd.processingErrors.column.filename"));
diff --git
a/src/test/java/org/apache/maven/plugins/pmd/AbstractPmdReportTestCase.java
b/src/test/java/org/apache/maven/plugins/pmd/AbstractPmdReportTestCase.java
index fce2159..e939283 100644
--- a/src/test/java/org/apache/maven/plugins/pmd/AbstractPmdReportTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/pmd/AbstractPmdReportTestCase.java
@@ -21,9 +21,15 @@ package org.apache.maven.plugins.pmd;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
+import java.util.Collections;
+import java.util.List;
import java.util.Locale;
+import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.LegacySupport;
+import org.apache.maven.plugin.MojoExecution;
+import org.apache.maven.plugin.descriptor.MojoDescriptor;
+import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.plugin.testing.ArtifactStubFactory;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
@@ -110,8 +116,17 @@ public abstract class AbstractPmdReportTestCase extends
AbstractMojoTestCase {
repoSession.setLocalRepositoryManager(new
SimpleLocalRepositoryManagerFactory()
.newInstance(repoSession, new
LocalRepository(artifactStubFactory.getWorkingDir())));
+ List<MavenProject> reactorProjects =
+ mojo.getReactorProjects() != null ? mojo.getReactorProjects()
: Collections.emptyList();
+
+ setVariableValueToObject(mojo, "mojoExecution",
getMockMojoExecution());
setVariableValueToObject(mojo, "session", legacySupport.getSession());
- setVariableValueToObject(mojo, "remoteRepositories",
mojo.getProject().getRemoteArtifactRepositories());
+ setVariableValueToObject(mojo, "repoSession",
legacySupport.getRepositorySession());
+ setVariableValueToObject(mojo, "reactorProjects", reactorProjects);
+ setVariableValueToObject(
+ mojo, "remoteProjectRepositories",
mojo.getProject().getRemoteProjectRepositories());
+ setVariableValueToObject(
+ mojo, "siteDirectory", new
File(mojo.getProject().getBasedir(), "src/site"));
return mojo;
}
@@ -149,4 +164,22 @@ public abstract class AbstractPmdReportTestCase extends
AbstractMojoTestCase {
public static boolean lowerCaseContains(String text, String contains) {
return
text.toLowerCase(Locale.ROOT).contains(contains.toLowerCase(Locale.ROOT));
}
+
+ private MojoExecution getMockMojoExecution() {
+ MojoDescriptor md = new MojoDescriptor();
+ md.setGoal(getGoal());
+
+ MojoExecution me = new MojoExecution(md);
+
+ PluginDescriptor pd = new PluginDescriptor();
+ Plugin p = new Plugin();
+ p.setGroupId("org.apache.maven.plugins");
+ p.setArtifactId("maven-pmd-plugin");
+ pd.setPlugin(p);
+ md.setPluginDescriptor(pd);
+
+ return me;
+ }
+
+ protected abstract String getGoal();
}
diff --git a/src/test/java/org/apache/maven/plugins/pmd/CpdReportTest.java
b/src/test/java/org/apache/maven/plugins/pmd/CpdReportTest.java
index ac49a29..d9145cb 100644
--- a/src/test/java/org/apache/maven/plugins/pmd/CpdReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/pmd/CpdReportTest.java
@@ -25,7 +25,6 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
-import java.util.Locale;
import org.apache.commons.lang3.StringUtils;
import org.codehaus.plexus.util.FileUtils;
@@ -42,7 +41,6 @@ public class CpdReportTest extends AbstractPmdReportTestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
- Locale.setDefault(Locale.ENGLISH);
FileUtils.deleteDirectory(new File(getBasedir(), "target/test/unit"));
}
@@ -263,4 +261,9 @@ public class CpdReportTest extends
AbstractPmdReportTestCase {
String str = readFile(generatedFile);
assertEquals(0, StringUtils.countMatches(str, "<duplication"));
}
+
+ @Override
+ protected String getGoal() {
+ return "cpd";
+ }
}
diff --git
a/src/test/java/org/apache/maven/plugins/pmd/CpdViolationCheckMojoTest.java
b/src/test/java/org/apache/maven/plugins/pmd/CpdViolationCheckMojoTest.java
index 5d7db5b..859dbdf 100644
--- a/src/test/java/org/apache/maven/plugins/pmd/CpdViolationCheckMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/pmd/CpdViolationCheckMojoTest.java
@@ -87,4 +87,9 @@ public class CpdViolationCheckMojoTest extends
AbstractPmdReportTestCase {
// this call shouldn't throw an exception, as the classes with
duplications have been excluded
cpdViolationMojo.execute();
}
+
+ @Override
+ protected String getGoal() {
+ return "cpd-check";
+ }
}
diff --git a/src/test/java/org/apache/maven/plugins/pmd/PmdReportTest.java
b/src/test/java/org/apache/maven/plugins/pmd/PmdReportTest.java
index eed633a..595ed0b 100644
--- a/src/test/java/org/apache/maven/plugins/pmd/PmdReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/pmd/PmdReportTest.java
@@ -25,7 +25,6 @@ import java.io.IOException;
import java.net.ServerSocket;
import java.net.URL;
import java.nio.charset.StandardCharsets;
-import java.util.Locale;
import com.github.tomakehurst.wiremock.WireMockServer;
import com.github.tomakehurst.wiremock.client.WireMock;
@@ -48,7 +47,6 @@ public class PmdReportTest extends AbstractPmdReportTestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
- Locale.setDefault(Locale.ENGLISH);
FileUtils.deleteDirectory(new File(getBasedir(), "target/test/unit"));
}
@@ -86,9 +84,9 @@ public class PmdReportTest extends AbstractPmdReportTestCase {
assertTrue(str.contains("pmd_rules_java_bestpractices.html#unusedprivatefield\">UnusedPrivateField</a>"));
// there should be the section Violations By Priority
- assertTrue(str.contains("Violations By Priority</h2>"));
- assertTrue(str.contains("Priority 3</h3>"));
- assertTrue(str.contains("Priority 4</h3>"));
+ assertTrue(str.contains("Violations By Priority</h1>"));
+ assertTrue(str.contains("Priority 3</h2>"));
+ assertTrue(str.contains("Priority 4</h2>"));
// the file App.java is mentioned 3 times: in prio 3, in prio 4 and in
the files section
assertEquals(3, StringUtils.countMatches(str,
"def/configuration/App.java"));
@@ -687,4 +685,9 @@ public class PmdReportTest extends
AbstractPmdReportTestCase {
mockServer.stop();
}
+
+ @Override
+ protected String getGoal() {
+ return "pmd";
+ }
}
diff --git
a/src/test/java/org/apache/maven/plugins/pmd/PmdViolationCheckMojoTest.java
b/src/test/java/org/apache/maven/plugins/pmd/PmdViolationCheckMojoTest.java
index b47508b..e1b50b1 100644
--- a/src/test/java/org/apache/maven/plugins/pmd/PmdViolationCheckMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/pmd/PmdViolationCheckMojoTest.java
@@ -143,4 +143,9 @@ public class PmdViolationCheckMojoTest extends
AbstractPmdReportTestCase {
// this call shouldn't throw an exception, as the classes with
violations have been excluded
pmdViolationMojo.execute();
}
+
+ @Override
+ protected String getGoal() {
+ return "pmd-check";
+ }
}
diff --git
a/src/test/java/org/apache/maven/plugins/pmd/stubs/CustomConfigurationMavenProjectStub.java
b/src/test/java/org/apache/maven/plugins/pmd/stubs/CustomConfigurationMavenProjectStub.java
index 93609dc..9a11f25 100644
---
a/src/test/java/org/apache/maven/plugins/pmd/stubs/CustomConfigurationMavenProjectStub.java
+++
b/src/test/java/org/apache/maven/plugins/pmd/stubs/CustomConfigurationMavenProjectStub.java
@@ -44,8 +44,7 @@ public class CustomConfigurationMavenProjectStub extends
PmdProjectStub {
Model model = null;
try {
- model = pomReader.read(new FileReader(new File(getBasedir()
- +
"/src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml")));
+ model = pomReader.read(new FileReader(new File(getBasedir() + "/"
+ getPOM())));
setModel(model);
} catch (Exception e) {
@@ -64,15 +63,15 @@ public class CustomConfigurationMavenProjectStub extends
PmdProjectStub {
Build build = new Build();
build.setFinalName(model.getBuild().getFinalName());
- build.setDirectory(getBasedir() +
"/target/test/unit/custom-configuration/target");
- build.setSourceDirectory(getBasedir() +
"/src/test/resources/unit/custom-configuration");
+ build.setDirectory(getBasedir() + "/target");
+ build.setSourceDirectory(getBasedir().getAbsolutePath());
setBuild(build);
setReportPlugins(model.getReporting().getPlugins());
String basedir = getBasedir().getAbsolutePath();
List<String> compileSourceRoots = new ArrayList<>();
- compileSourceRoots.add(basedir +
"/src/test/resources/unit/custom-configuration/custom/configuration");
+ compileSourceRoots.add(basedir + "/custom/configuration");
setCompileSourceRoots(compileSourceRoots);
Artifact artifact = new PmdPluginArtifactStub(getGroupId(),
getArtifactId(), getVersion(), getPackaging());
@@ -103,4 +102,14 @@ public class CustomConfigurationMavenProjectStub extends
PmdProjectStub {
public List<ReportPlugin> getReportPlugins() {
return reportPlugins;
}
+
+ @Override
+ public File getBasedir() {
+ return new File(super.getBasedir() + "/custom-configuration");
+ }
+
+ @Override
+ protected String getPOM() {
+ return "custom-configuration-plugin-config.xml";
+ }
}
diff --git
a/src/test/java/org/apache/maven/plugins/pmd/stubs/DefaultConfigurationMavenProjectStub.java
b/src/test/java/org/apache/maven/plugins/pmd/stubs/DefaultConfigurationMavenProjectStub.java
index b16da8d..c7b1015 100644
---
a/src/test/java/org/apache/maven/plugins/pmd/stubs/DefaultConfigurationMavenProjectStub.java
+++
b/src/test/java/org/apache/maven/plugins/pmd/stubs/DefaultConfigurationMavenProjectStub.java
@@ -43,8 +43,7 @@ public class DefaultConfigurationMavenProjectStub extends
PmdProjectStub {
MavenXpp3Reader pomReader = new MavenXpp3Reader();
Model model = null;
- try (FileReader reader = new FileReader(new File(getBasedir()
- +
"/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml")))
{
+ try (FileReader reader = new FileReader(new File(getBasedir() + "/" +
getPOM()))) {
model = pomReader.read(reader);
setModel(model);
} catch (Exception e) {
@@ -64,15 +63,15 @@ public class DefaultConfigurationMavenProjectStub extends
PmdProjectStub {
Build build = new Build();
build.setFinalName(model.getBuild().getFinalName());
- build.setDirectory(getBasedir() +
"/target/test/unit/default-configuration/target");
- build.setSourceDirectory(getBasedir() +
"/src/test/resources/unit/default-configuration");
+ build.setDirectory(getBasedir() + "/target");
+ build.setSourceDirectory(getBasedir().getAbsolutePath());
setBuild(build);
setReportPlugins(model.getReporting().getPlugins());
String basedir = getBasedir().getAbsolutePath();
List<String> compileSourceRoots = new ArrayList<>();
- compileSourceRoots.add(basedir +
"/src/test/resources/unit/default-configuration/def/configuration");
+ compileSourceRoots.add(basedir + "/def/configuration");
setCompileSourceRoots(compileSourceRoots);
File file = new File(getBasedir().getAbsolutePath() + "/pom.xml");
@@ -104,4 +103,14 @@ public class DefaultConfigurationMavenProjectStub extends
PmdProjectStub {
public Build getBuild() {
return build;
}
+
+ @Override
+ public File getBasedir() {
+ return new File(super.getBasedir() + "/default-configuration");
+ }
+
+ @Override
+ protected String getPOM() {
+ return "default-configuration-plugin-config.xml";
+ }
}
diff --git
a/src/test/java/org/apache/maven/plugins/pmd/stubs/InvalidFormatMavenProjectStub.java
b/src/test/java/org/apache/maven/plugins/pmd/stubs/InvalidFormatMavenProjectStub.java
index c08e19c..90894c9 100644
---
a/src/test/java/org/apache/maven/plugins/pmd/stubs/InvalidFormatMavenProjectStub.java
+++
b/src/test/java/org/apache/maven/plugins/pmd/stubs/InvalidFormatMavenProjectStub.java
@@ -41,8 +41,7 @@ public class InvalidFormatMavenProjectStub extends
PmdProjectStub {
Model model = null;
try {
- model = pomReader.read(new FileReader(new File(
- getBasedir() +
"/src/test/resources/unit/invalid-format/invalid-format-plugin-config.xml")));
+ model = pomReader.read(new FileReader(new File(getBasedir() + "/"
+ getPOM())));
setModel(model);
} catch (Exception e) {
@@ -61,13 +60,13 @@ public class InvalidFormatMavenProjectStub extends
PmdProjectStub {
Build build = new Build();
build.setFinalName(model.getBuild().getFinalName());
- build.setDirectory(getBasedir() +
"/target/test/unit/invalid-format/target");
- build.setSourceDirectory(getBasedir() +
"/src/test/resources/unit/invalid-format");
+ build.setDirectory(getBasedir() + "/target");
+ build.setSourceDirectory(getBasedir().getAbsolutePath());
setBuild(build);
String basedir = getBasedir().getAbsolutePath();
List<String> compileSourceRoots = new ArrayList<>();
- compileSourceRoots.add(basedir +
"/src/test/resources/unit/invalid-format/invalid/format");
+ compileSourceRoots.add(basedir + "/invalid/format");
setCompileSourceRoots(compileSourceRoots);
Artifact artifact = new PmdPluginArtifactStub(getGroupId(),
getArtifactId(), getVersion(), getPackaging());
@@ -88,4 +87,14 @@ public class InvalidFormatMavenProjectStub extends
PmdProjectStub {
public Build getBuild() {
return build;
}
+
+ @Override
+ public File getBasedir() {
+ return new File(super.getBasedir() + "/invalid-format");
+ }
+
+ @Override
+ protected String getPOM() {
+ return "invalid-format-plugin-config.xml";
+ }
}
diff --git
a/src/test/java/org/apache/maven/plugins/pmd/stubs/PmdProjectStub.java
b/src/test/java/org/apache/maven/plugins/pmd/stubs/PmdProjectStub.java
index fd34c4f..1a0d86f 100644
--- a/src/test/java/org/apache/maven/plugins/pmd/stubs/PmdProjectStub.java
+++ b/src/test/java/org/apache/maven/plugins/pmd/stubs/PmdProjectStub.java
@@ -18,16 +18,34 @@
*/
package org.apache.maven.plugins.pmd.stubs;
+import java.io.File;
import java.util.Collections;
import java.util.List;
+import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.MavenArtifactRepository;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
+import org.eclipse.aether.repository.RemoteRepository;
public abstract class PmdProjectStub extends MavenProjectStub {
+ /**
+ * @return the POM file name
+ */
+ protected abstract String getPOM();
+
+ @Override
+ public File getBasedir() {
+ return new File(super.getBasedir() + "/src/test/resources/unit/");
+ }
+
+ @Override
+ public File getFile() {
+ return new File(getBasedir(), getPOM());
+ }
+
@Override
public List<ArtifactRepository> getRemoteArtifactRepositories() {
ArtifactRepository repository = new MavenArtifactRepository(
@@ -39,4 +57,9 @@ public abstract class PmdProjectStub extends MavenProjectStub
{
return Collections.singletonList(repository);
}
+
+ @Override
+ public List<RemoteRepository> getRemoteProjectRepositories() {
+ return RepositoryUtils.toRepos(getRemoteArtifactRepositories());
+ }
}
diff --git
a/src/test/resources/unit/custom-configuration/cpd-custom-configuration-plugin-config.xml
b/src/test/resources/unit/custom-configuration/cpd-custom-configuration-plugin-config.xml
index 3595589..6fd8a79 100644
---
a/src/test/resources/unit/custom-configuration/cpd-custom-configuration-plugin-config.xml
+++
b/src/test/resources/unit/custom-configuration/cpd-custom-configuration-plugin-config.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.CustomConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/custom-configuration/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/custom-configuration/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<format>csv</format>
<linkXRef>false</linkXRef>
<xrefLocation>${basedir}/target/test/unit/custom-configuration/target/site/xref</xrefLocation>
diff --git
a/src/test/resources/unit/custom-configuration/cpd-txt-format-configuration-plugin-config.xml
b/src/test/resources/unit/custom-configuration/cpd-txt-format-configuration-plugin-config.xml
index eb7d1fe..ffc2903 100644
---
a/src/test/resources/unit/custom-configuration/cpd-txt-format-configuration-plugin-config.xml
+++
b/src/test/resources/unit/custom-configuration/cpd-txt-format-configuration-plugin-config.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/custom-configuration/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/custom-configuration/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<format>txt</format>
<linkXRef>false</linkXRef>
<minimumTokens>30</minimumTokens>
diff --git
a/src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml
b/src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml
index 8cfd6ef..d1ff3f4 100644
---
a/src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml
+++
b/src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.CustomConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/custom-configuration/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/custom-configuration/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<rulesetsTargetDirectory>${basedir}/target/test/unit/custom-configuration/target/pmd/rulesets</rulesetsTargetDirectory>
<format>csv</format>
<linkXRef>true</linkXRef>
diff --git
a/src/test/resources/unit/custom-configuration/pmd-check-exception-test-plugin-config.xml
b/src/test/resources/unit/custom-configuration/pmd-check-exception-test-plugin-config.xml
index 4f6add4..90532ab 100644
---
a/src/test/resources/unit/custom-configuration/pmd-check-exception-test-plugin-config.xml
+++
b/src/test/resources/unit/custom-configuration/pmd-check-exception-test-plugin-config.xml
@@ -32,7 +32,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <configuration>
+ <configuration>
<sourceDirectory>${basedir}/src/test/resources/unit/custom-configuration</sourceDirectory>
<targetDirectory>${basedir}/target/test/unit/custom-configuration/target</targetDirectory>
<rulesetsTargetDirectory>${basedir}/target/test/unit/custom-configuration/target/pmd/rulesets</rulesetsTargetDirectory>
diff --git
a/src/test/resources/unit/default-configuration/cpd-default-configuration-plugin-config.xml
b/src/test/resources/unit/default-configuration/cpd-default-configuration-plugin-config.xml
index e57fe5d..a201c3e 100644
---
a/src/test/resources/unit/default-configuration/cpd-default-configuration-plugin-config.xml
+++
b/src/test/resources/unit/default-configuration/cpd-default-configuration-plugin-config.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/default-configuration/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<format>xml</format>
<linkXRef>false</linkXRef>
<xrefLocation>${basedir}/target/test/unit/default-configuration/target/site/xref</xrefLocation>
diff --git
a/src/test/resources/unit/default-configuration/cpd-javascript-plugin-config.xml
b/src/test/resources/unit/default-configuration/cpd-javascript-plugin-config.xml
index f7e045a..089fb48 100644
---
a/src/test/resources/unit/default-configuration/cpd-javascript-plugin-config.xml
+++
b/src/test/resources/unit/default-configuration/cpd-javascript-plugin-config.xml
@@ -35,7 +35,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/default-configuration/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<format>xml</format>
<linkXRef>false</linkXRef>
<xrefLocation>${basedir}/target/test/unit/default-configuration/target/site/xref</xrefLocation>
diff --git
a/src/test/resources/unit/default-configuration/cpd-jsp-plugin-config.xml
b/src/test/resources/unit/default-configuration/cpd-jsp-plugin-config.xml
index 6ad62d0..3cb44b3 100644
--- a/src/test/resources/unit/default-configuration/cpd-jsp-plugin-config.xml
+++ b/src/test/resources/unit/default-configuration/cpd-jsp-plugin-config.xml
@@ -35,7 +35,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/default-configuration/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<format>xml</format>
<linkXRef>false</linkXRef>
<xrefLocation>${basedir}/target/test/unit/default-configuration/target/site/xref</xrefLocation>
diff --git
a/src/test/resources/unit/default-configuration/cpd-report-cpd-exclusions-configuration-plugin-config.xml
b/src/test/resources/unit/default-configuration/cpd-report-cpd-exclusions-configuration-plugin-config.xml
index 85ea191..76efc02 100644
---
a/src/test/resources/unit/default-configuration/cpd-report-cpd-exclusions-configuration-plugin-config.xml
+++
b/src/test/resources/unit/default-configuration/cpd-report-cpd-exclusions-configuration-plugin-config.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/default-configuration/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<format>xml</format>
<linkXRef>false</linkXRef>
<xrefLocation>${basedir}/target/test/unit/default-configuration/target/site/xref</xrefLocation>
diff --git
a/src/test/resources/unit/default-configuration/cpd-report-include-xml-in-site-plugin-config.xml
b/src/test/resources/unit/default-configuration/cpd-report-include-xml-in-site-plugin-config.xml
index 7920f0a..e2ced38 100644
---
a/src/test/resources/unit/default-configuration/cpd-report-include-xml-in-site-plugin-config.xml
+++
b/src/test/resources/unit/default-configuration/cpd-report-include-xml-in-site-plugin-config.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/default-configuration/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<format>xml</format>
<linkXRef>false</linkXRef>
<xrefLocation>${basedir}/target/test/unit/default-configuration/target/site/xref</xrefLocation>
diff --git
a/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
b/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
index 36e22ec..fb99dbf 100644
---
a/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
+++
b/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/default-configuration/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<rulesetsTargetDirectory>${basedir}/target/test/unit/default-configuration/target/pmd/rulesets</rulesetsTargetDirectory>
<format>xml</format>
<linkXRef>true</linkXRef>
diff --git
a/src/test/resources/unit/default-configuration/javascript-configuration-plugin-config.xml
b/src/test/resources/unit/default-configuration/javascript-configuration-plugin-config.xml
index 2445754..791540f 100644
---
a/src/test/resources/unit/default-configuration/javascript-configuration-plugin-config.xml
+++
b/src/test/resources/unit/default-configuration/javascript-configuration-plugin-config.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/default-configuration/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<rulesetsTargetDirectory>${basedir}/target/test/unit/default-configuration/target/pmd/rulesets</rulesetsTargetDirectory>
<format>xml</format>
<inputEncoding>UTF-8</inputEncoding>
diff --git
a/src/test/resources/unit/default-configuration/jsp-configuration-plugin-config.xml
b/src/test/resources/unit/default-configuration/jsp-configuration-plugin-config.xml
index 0de5159..a0fa7f4 100644
---
a/src/test/resources/unit/default-configuration/jsp-configuration-plugin-config.xml
+++
b/src/test/resources/unit/default-configuration/jsp-configuration-plugin-config.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/default-configuration/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<rulesetsTargetDirectory>${basedir}/target/test/unit/default-configuration/target/pmd/rulesets</rulesetsTargetDirectory>
<format>xml</format>
<inputEncoding>UTF-8</inputEncoding>
diff --git
a/src/test/resources/unit/default-configuration/pmd-report-custom-rules.xml
b/src/test/resources/unit/default-configuration/pmd-report-custom-rules.xml
index b5f9c4d..c737e21 100644
--- a/src/test/resources/unit/default-configuration/pmd-report-custom-rules.xml
+++ b/src/test/resources/unit/default-configuration/pmd-report-custom-rules.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/default-configuration/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<rulesetsTargetDirectory>${basedir}/target/test/unit/default-configuration/target/pmd/rulesets</rulesetsTargetDirectory>
<rulesets>
<ruleset>${basedir}/src/test/resources/unit/default-configuration/rulesets/custom-rules.xml</ruleset>
diff --git
a/src/test/resources/unit/default-configuration/pmd-report-include-xml-in-site-plugin-config.xml
b/src/test/resources/unit/default-configuration/pmd-report-include-xml-in-site-plugin-config.xml
index e62b70c..8cb2594 100644
---
a/src/test/resources/unit/default-configuration/pmd-report-include-xml-in-site-plugin-config.xml
+++
b/src/test/resources/unit/default-configuration/pmd-report-include-xml-in-site-plugin-config.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/default-configuration/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<rulesetsTargetDirectory>${basedir}/target/test/unit/default-configuration/target/pmd/rulesets</rulesetsTargetDirectory>
<format>xml</format>
<inputEncoding>UTF-8</inputEncoding>
diff --git
a/src/test/resources/unit/default-configuration/pmd-report-no-render-violations-by-priority.xml
b/src/test/resources/unit/default-configuration/pmd-report-no-render-violations-by-priority.xml
index a9db808..9194f6f 100644
---
a/src/test/resources/unit/default-configuration/pmd-report-no-render-violations-by-priority.xml
+++
b/src/test/resources/unit/default-configuration/pmd-report-no-render-violations-by-priority.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/default-configuration/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<rulesetsTargetDirectory>${basedir}/target/test/unit/default-configuration/target/pmd/rulesets</rulesetsTargetDirectory>
<format>xml</format>
<linkXRef>true</linkXRef>
diff --git
a/src/test/resources/unit/default-configuration/pmd-report-not-render-rule-priority-plugin-config.xml
b/src/test/resources/unit/default-configuration/pmd-report-not-render-rule-priority-plugin-config.xml
index f2633ce..572a5e1 100644
---
a/src/test/resources/unit/default-configuration/pmd-report-not-render-rule-priority-plugin-config.xml
+++
b/src/test/resources/unit/default-configuration/pmd-report-not-render-rule-priority-plugin-config.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/default-configuration/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<rulesetsTargetDirectory>${basedir}/target/test/unit/default-configuration/target/pmd/rulesets</rulesetsTargetDirectory>
<format>xml</format>
<linkXRef>true</linkXRef>
diff --git
a/src/test/resources/unit/default-configuration/pmd-report-pmd-exclusions-configuration-plugin-config.xml
b/src/test/resources/unit/default-configuration/pmd-report-pmd-exclusions-configuration-plugin-config.xml
index 246d495..3387d3e 100644
---
a/src/test/resources/unit/default-configuration/pmd-report-pmd-exclusions-configuration-plugin-config.xml
+++
b/src/test/resources/unit/default-configuration/pmd-report-pmd-exclusions-configuration-plugin-config.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/default-configuration/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<rulesetsTargetDirectory>${basedir}/target/test/unit/default-configuration/target/pmd/rulesets</rulesetsTargetDirectory>
<format>xml</format>
<linkXRef>true</linkXRef>
diff --git
a/src/test/resources/unit/default-configuration/pmd-report-resolve-rulesets.xml
b/src/test/resources/unit/default-configuration/pmd-report-resolve-rulesets.xml
index a36a855..74441e2 100644
---
a/src/test/resources/unit/default-configuration/pmd-report-resolve-rulesets.xml
+++
b/src/test/resources/unit/default-configuration/pmd-report-resolve-rulesets.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/default-configuration/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<rulesetsTargetDirectory>${basedir}/target/test/unit/default-configuration/target/pmd/rulesets</rulesetsTargetDirectory>
<rulesets>
<ruleset>${basedir}/src/test/resources/unit/default-configuration/rulesets/custom-rules.xml</ruleset>
diff --git
a/src/test/resources/unit/default-configuration/pmd-with-analysis-cache-plugin-config.xml
b/src/test/resources/unit/default-configuration/pmd-with-analysis-cache-plugin-config.xml
index df2c0f1..642f124 100644
---
a/src/test/resources/unit/default-configuration/pmd-with-analysis-cache-plugin-config.xml
+++
b/src/test/resources/unit/default-configuration/pmd-with-analysis-cache-plugin-config.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/pmd-with-analysis-cache-plugin-config/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/pmd-with-analysis-cache-plugin-config/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<rulesetsTargetDirectory>${basedir}/target/test/unit/pmd-with-analysis-cache-plugin-config/target/pmd/rulesets</rulesetsTargetDirectory>
<format>xml</format>
<linkXRef>true</linkXRef>
diff --git
a/src/test/resources/unit/default-configuration/pmd-with-suppressMarker-no-render-plugin-config.xml
b/src/test/resources/unit/default-configuration/pmd-with-suppressMarker-no-render-plugin-config.xml
index 9ed6257..d388969 100644
---
a/src/test/resources/unit/default-configuration/pmd-with-suppressMarker-no-render-plugin-config.xml
+++
b/src/test/resources/unit/default-configuration/pmd-with-suppressMarker-no-render-plugin-config.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/default-configuration/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<rulesetsTargetDirectory>${basedir}/target/test/unit/default-configuration/target/pmd/rulesets</rulesetsTargetDirectory>
<format>xml</format>
<linkXRef>true</linkXRef>
diff --git
a/src/test/resources/unit/default-configuration/pmd-with-suppressMarker-plugin-config.xml
b/src/test/resources/unit/default-configuration/pmd-with-suppressMarker-plugin-config.xml
index c5116dd..efd8523 100644
---
a/src/test/resources/unit/default-configuration/pmd-with-suppressMarker-plugin-config.xml
+++
b/src/test/resources/unit/default-configuration/pmd-with-suppressMarker-plugin-config.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/default-configuration/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<rulesetsTargetDirectory>${basedir}/target/test/unit/default-configuration/target/pmd/rulesets</rulesetsTargetDirectory>
<format>xml</format>
<linkXRef>true</linkXRef>
diff --git
a/src/test/resources/unit/empty-report/cpd-empty-report-plugin-config.xml
b/src/test/resources/unit/empty-report/cpd-empty-report-plugin-config.xml
index be2b534..e0001ec 100644
--- a/src/test/resources/unit/empty-report/cpd-empty-report-plugin-config.xml
+++ b/src/test/resources/unit/empty-report/cpd-empty-report-plugin-config.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.CustomConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/empty-report/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/empty-report/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<compileSourceRoots>
<compileSourceRoot>${basedir}/src/test/resources/unit/empty-report/java/</compileSourceRoot>
</compileSourceRoots>
diff --git
a/src/test/resources/unit/empty-report/empty-report-plugin-config.xml
b/src/test/resources/unit/empty-report/empty-report-plugin-config.xml
index c1c6ea8..00c24f0 100644
--- a/src/test/resources/unit/empty-report/empty-report-plugin-config.xml
+++ b/src/test/resources/unit/empty-report/empty-report-plugin-config.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.CustomConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/empty-report/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/empty-report/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<rulesetsTargetDirectory>${basedir}/target/test/unit/empty-report/target/pmd/rulesets</rulesetsTargetDirectory>
<compileSourceRoots>
<compileSourceRoot>${basedir}/src/test/resources/unit/empty-report/java/</compileSourceRoot>
diff --git
a/src/test/resources/unit/exclude-roots/pmd-exclude-roots-plugin-config.xml
b/src/test/resources/unit/exclude-roots/pmd-exclude-roots-plugin-config.xml
index ac800c7..bec142f 100644
--- a/src/test/resources/unit/exclude-roots/pmd-exclude-roots-plugin-config.xml
+++ b/src/test/resources/unit/exclude-roots/pmd-exclude-roots-plugin-config.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/exclude-roots/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/exclude-roots/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<rulesetsTargetDirectory>${basedir}/target/test/unit/exclude-roots/target/pmd/rulesets</rulesetsTargetDirectory>
<format>xml</format>
<inputEncoding>UTF-8</inputEncoding>
diff --git
a/src/test/resources/unit/processing-error/pmd-processing-error-no-report-plugin-config.xml
b/src/test/resources/unit/processing-error/pmd-processing-error-no-report-plugin-config.xml
index ba7f86f..40f087f 100644
---
a/src/test/resources/unit/processing-error/pmd-processing-error-no-report-plugin-config.xml
+++
b/src/test/resources/unit/processing-error/pmd-processing-error-no-report-plugin-config.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/parse-error/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/parse-error/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<rulesetsTargetDirectory>${basedir}/target/test/unit/parse-error/target/pmd/rulesets</rulesetsTargetDirectory>
<format>xml</format>
<inputEncoding>UTF-8</inputEncoding>
diff --git
a/src/test/resources/unit/processing-error/pmd-processing-error-skip-plugin-config.xml
b/src/test/resources/unit/processing-error/pmd-processing-error-skip-plugin-config.xml
index 686d705..55c8a4d 100644
---
a/src/test/resources/unit/processing-error/pmd-processing-error-skip-plugin-config.xml
+++
b/src/test/resources/unit/processing-error/pmd-processing-error-skip-plugin-config.xml
@@ -36,7 +36,6 @@ under the License.
<project
implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
<outputDirectory>${basedir}/target/test/unit/parse-error/target/site</outputDirectory>
<targetDirectory>${basedir}/target/test/unit/parse-error/target</targetDirectory>
- <localRepository>${localRepository}</localRepository>
<rulesetsTargetDirectory>${basedir}/target/test/unit/parse-error/target/pmd/rulesets</rulesetsTargetDirectory>
<format>xml</format>
<inputEncoding>UTF-8</inputEncoding>
