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 37abfb672ae7cb22f31789fa07d154382459280f Author: Michael Osipov <[email protected]> AuthorDate: Sat Dec 3 00:05:15 2022 +0100 Prepare for Doxia 2.0.0 --- pom.xml | 51 ++++++---------------- 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 | 14 +++--- .../maven/plugins/pmd/CpdReportGenerator.java | 2 +- .../maven/plugins/pmd/PmdReportGenerator.java | 6 +-- .../plugins/pmd/AbstractPmdReportTestCase.java | 9 +++- .../apache/maven/plugins/pmd/CpdReportTest.java | 2 - .../apache/maven/plugins/pmd/PmdReportTest.java | 8 ++-- .../stubs/CustomConfigurationMavenProjectStub.java | 18 ++++++-- .../DefaultConfigurationMavenProjectStub.java | 18 ++++++-- .../pmd/stubs/InvalidFormatMavenProjectStub.java | 18 ++++++-- .../maven/plugins/pmd/stubs/PmdProjectStub.java | 26 +++++++++++ .../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 - 52 files changed, 164 insertions(+), 158 deletions(-) diff --git a/pom.xml b/pom.xml index 07d5560..e3432a3 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,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> @@ -86,15 +86,15 @@ under the License. <properties> <mavenVersion>3.2.5</mavenVersion> - <doxiaVersion>1.12.0</doxiaVersion> - <doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion> + <doxiaVersion>2.0.0-M6</doxiaVersion> <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-M6</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> @@ -118,6 +118,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> @@ -191,43 +197,12 @@ under the License. <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> - </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-M5</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 c262397..8f459c7 100644 --- a/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java +++ b/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java @@ -245,12 +245,6 @@ public abstract class AbstractPmdReport // 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. @@ -264,15 +258,17 @@ public abstract class AbstractPmdReport /** 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; 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 1823055..7552c3c 100644 --- a/src/main/java/org/apache/maven/plugins/pmd/CpdReportGenerator.java +++ b/src/main/java/org/apache/maven/plugins/pmd/CpdReportGenerator.java @@ -165,7 +165,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 623b7c9..529c720 100644 --- a/src/main/java/org/apache/maven/plugins/pmd/PmdReportGenerator.java +++ b/src/main/java/org/apache/maven/plugins/pmd/PmdReportGenerator.java @@ -166,7 +166,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" ) ); @@ -408,7 +408,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" ) ); @@ -475,7 +475,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 f0d5524..d7de9bd 100644 --- a/src/test/java/org/apache/maven/plugins/pmd/AbstractPmdReportTestCase.java +++ b/src/test/java/org/apache/maven/plugins/pmd/AbstractPmdReportTestCase.java @@ -22,6 +22,8 @@ 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.plugin.LegacySupport; @@ -121,8 +123,13 @@ public abstract class AbstractPmdReportTestCase (DefaultRepositorySystemSession) legacySupport.getRepositorySession(); repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( repoSession, new LocalRepository( artifactStubFactory.getWorkingDir() ) ) ); + List<MavenProject> reactorProjects = mojo.getReactorProjects() != null ? mojo.getReactorProjects() : Collections.emptyList(); + 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; } 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 efb3d58..1ba8e7c 100644 --- a/src/test/java/org/apache/maven/plugins/pmd/CpdReportTest.java +++ b/src/test/java/org/apache/maven/plugins/pmd/CpdReportTest.java @@ -23,7 +23,6 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.util.Locale; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -47,7 +46,6 @@ public class CpdReportTest throws Exception { super.setUp(); - Locale.setDefault( Locale.ENGLISH ); FileUtils.deleteDirectory( new File( getBasedir(), "target/test/unit" ) ); } 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 d53ba48..e94b930 100644 --- a/src/test/java/org/apache/maven/plugins/pmd/PmdReportTest.java +++ b/src/test/java/org/apache/maven/plugins/pmd/PmdReportTest.java @@ -26,7 +26,6 @@ import java.io.IOException; import java.net.ServerSocket; import java.net.URL; import java.nio.charset.StandardCharsets; -import java.util.Locale; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; @@ -55,7 +54,6 @@ public class PmdReportTest throws Exception { super.setUp(); - Locale.setDefault( Locale.ENGLISH ); FileUtils.deleteDirectory( new File( getBasedir(), "target/test/unit" ) ); } @@ -93,9 +91,9 @@ public class PmdReportTest 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" ) ); 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 4fe1d67..59448eb 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 @@ -51,7 +51,7 @@ public class CustomConfigurationMavenProjectStub { model = pomReader.read( new FileReader( new File( getBasedir() - + "/src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml" ) ) ); + + "/" + getPOM() ) ) ); setModel( model ); } catch ( Exception e ) @@ -72,15 +72,15 @@ public class CustomConfigurationMavenProjectStub 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() ); @@ -116,4 +116,14 @@ public class CustomConfigurationMavenProjectStub 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 daac795..472c88a 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 @@ -48,7 +48,7 @@ public class DefaultConfigurationMavenProjectStub Model model = null; try ( FileReader reader = new FileReader( new File( getBasedir() - + "/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml" ) ) ) + + "/" + getPOM() ) ) ) { model = pomReader.read( reader ); setModel( model ); @@ -72,8 +72,8 @@ public class DefaultConfigurationMavenProjectStub 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() @@ -81,7 +81,7 @@ public class DefaultConfigurationMavenProjectStub 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" ); @@ -118,4 +118,14 @@ public class DefaultConfigurationMavenProjectStub { 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 f700313..57612e5 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 @@ -48,7 +48,7 @@ public class InvalidFormatMavenProjectStub { model = pomReader.read( new FileReader( new File( getBasedir() - + "/src/test/resources/unit/invalid-format/invalid-format-plugin-config.xml" ) ) ); + + "/" + getPOM() ) ) ); setModel( model ); } catch ( Exception e ) @@ -69,13 +69,13 @@ public class InvalidFormatMavenProjectStub 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() ); @@ -100,4 +100,14 @@ public class InvalidFormatMavenProjectStub 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 0b8f6f9..4111331 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 @@ -19,18 +19,38 @@ package org.apache.maven.plugins.pmd.stubs; * under the License. */ +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() { @@ -39,4 +59,10 @@ public abstract class PmdProjectStub 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>
