You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ad...@apache.org on 2017/12/16 16:46:19 UTC
[maven-pmd-plugin] 05/07: [MPMD-247] Upgrade to PMD 6.0.0
This is an automated email from the ASF dual-hosted git repository.
adangel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git
commit 4d5e9f981c3d4566a4aa07f420175254fb2d6895
Author: Andreas Dangel <ad...@apache.org>
AuthorDate: Fri Dec 15 19:55:25 2017 +0100
[MPMD-247] Upgrade to PMD 6.0.0
Adjust remaining old ruleset references
---
src/it/MPMD-205-pmd-js-check/pom.xml | 6 +++---
src/it/MPMD-206-sourceDirectories-js/pom.xml | 6 +++---
.../org/apache/maven/plugins/pmd/PmdReportTest.java | 21 ++++++++++++++++-----
.../custom-configuration-plugin-config.xml | 4 +---
.../javascript-configuration-plugin-config.xml | 6 +++---
.../jsp-configuration-plugin-config.xml | 6 +++++-
6 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/src/it/MPMD-205-pmd-js-check/pom.xml b/src/it/MPMD-205-pmd-js-check/pom.xml
index 7d03e2b..f3382e1 100644
--- a/src/it/MPMD-205-pmd-js-check/pom.xml
+++ b/src/it/MPMD-205-pmd-js-check/pom.xml
@@ -59,9 +59,9 @@ under the License.
<configuration>
<language>javascript</language>
<rulesets>
- <ruleset>ecmascript-basic</ruleset>
- <ruleset>ecmascript-braces</ruleset>
- <ruleset>ecmascript-unnecessary</ruleset>
+ <ruleset>/category/ecmascript/bestpractices.xml</ruleset>
+ <ruleset>/category/ecmascript/codestyle.xml</ruleset>
+ <ruleset>/category/ecmascript/errorprone.xml</ruleset>
</rulesets>
<includes>
<include>**/*.js</include>
diff --git a/src/it/MPMD-206-sourceDirectories-js/pom.xml b/src/it/MPMD-206-sourceDirectories-js/pom.xml
index 7526304..4819272 100644
--- a/src/it/MPMD-206-sourceDirectories-js/pom.xml
+++ b/src/it/MPMD-206-sourceDirectories-js/pom.xml
@@ -43,9 +43,9 @@ under the License.
<configuration>
<language>javascript</language>
<rulesets>
- <ruleset>ecmascript-basic</ruleset>
- <ruleset>ecmascript-braces</ruleset>
- <ruleset>ecmascript-unnecessary</ruleset>
+ <ruleset>/category/ecmascript/bestpractices.xml</ruleset>
+ <ruleset>/category/ecmascript/codestyle.xml</ruleset>
+ <ruleset>/category/ecmascript/errorprone.xml</ruleset>
</rulesets>
<includes>
<include>**/*.js</include>
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 22f7280..b539e79 100644
--- a/src/test/java/org/apache/maven/plugins/pmd/PmdReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/pmd/PmdReportTest.java
@@ -117,14 +117,13 @@ public class PmdReportTest
assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) );
// these are the rulesets, that have been applied...
- generatedFile = new File( getBasedir(), "target/test/unit/default-configuration/target/ecmascript-basic.xml" );
+ generatedFile = new File( getBasedir(), "target/test/unit/default-configuration/target/bestpractices.xml" );
assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) );
- generatedFile = new File( getBasedir(), "target/test/unit/default-configuration/target/ecmascript-braces.xml" );
+ generatedFile = new File( getBasedir(), "target/test/unit/default-configuration/target/codestyle.xml" );
assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) );
- generatedFile =
- new File( getBasedir(), "target/test/unit/default-configuration/target/ecmascript-unnecessary.xml" );
+ generatedFile = new File( getBasedir(), "target/test/unit/default-configuration/target/errorprone.xml" );
assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) );
generatedFile = new File( getBasedir(), "target/test/unit/default-configuration/target/site/pmd.html" );
@@ -418,7 +417,19 @@ public class PmdReportTest
assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) );
// these are the rulesets, that have been applied...
- generatedFile = new File( getBasedir(), "target/test/unit/default-configuration/target/jsp-basic.xml" );
+ generatedFile = new File( getBasedir(), "target/test/unit/default-configuration/target/bestpractices.xml" );
+ assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) );
+
+ generatedFile = new File( getBasedir(), "target/test/unit/default-configuration/target/codestyle.xml" );
+ assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) );
+
+ generatedFile = new File( getBasedir(), "target/test/unit/default-configuration/target/design.xml" );
+ assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) );
+
+ generatedFile = new File( getBasedir(), "target/test/unit/default-configuration/target/errorprone.xml" );
+ assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) );
+
+ generatedFile = new File( getBasedir(), "target/test/unit/default-configuration/target/security.xml" );
assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) );
generatedFile = new File( getBasedir(), "target/test/unit/default-configuration/target/site/pmd.html" );
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 fce89b1..5a1df25 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
@@ -41,10 +41,8 @@ under the License.
<xrefLocation>${basedir}/target/test/unit/custom-configuration/target/site/xref</xrefLocation>
<sourceEncoding>ISO-8859-1</sourceEncoding>
<rulesets>
+ <ruleset>rulesets/java/maven-pmd-plugin-default.xml</ruleset>
<ruleset>${basedir}/src/test/resources/unit/custom-configuration/resources/rulesets/custom.xml</ruleset>
- <ruleset>java-basic</ruleset>
- <ruleset>rulesets/java/unusedcode.xml</ruleset>
- <ruleset>java-imports</ruleset>
</rulesets>
<targetJdk>1.4</targetJdk>
<minimumPriority>4</minimumPriority>
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 3d4bf2a..2a1abf8 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
@@ -40,9 +40,9 @@ under the License.
<sourceEncoding>UTF-8</sourceEncoding>
<language>javascript</language>
<rulesets>
- <ruleset>ecmascript-basic</ruleset>
- <ruleset>ecmascript-braces</ruleset>
- <ruleset>ecmascript-unnecessary</ruleset>
+ <ruleset>/category/ecmascript/bestpractices.xml</ruleset>
+ <ruleset>/category/ecmascript/codestyle.xml</ruleset>
+ <ruleset>/category/ecmascript/errorprone.xml</ruleset>
</rulesets>
<includes>
<include>**/*.js</include>
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 7da6814..14fe3bb 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
@@ -40,7 +40,11 @@ under the License.
<sourceEncoding>UTF-8</sourceEncoding>
<language>jsp</language>
<rulesets>
- <ruleset>jsp-basic</ruleset>
+ <ruleset>/category/jsp/bestpractices.xml</ruleset>
+ <ruleset>/category/jsp/codestyle.xml</ruleset>
+ <ruleset>/category/jsp/design.xml</ruleset>
+ <ruleset>/category/jsp/errorprone.xml</ruleset>
+ <ruleset>/category/jsp/security.xml</ruleset>
</rulesets>
<includes>
<include>**/*.jsp</include>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.