Author: adangel
Date: Sun Aug 7 09:46:47 2016
New Revision: 1755429
URL: http://svn.apache.org/viewvc?rev=1755429&view=rev
Log:
[MPMD-220] Upgrade to PMD 5.5.1
Enable the rulesets java-empty and java-unnecessary by default,
to remain backwards compatible. They have been in the past releases
part of java-basic.
Modified:
maven/plugins/trunk/maven-pmd-plugin/pom.xml
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/cpd-javascript-plugin-config.xml
Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1755429&r1=1755428&r2=1755429&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Sun Aug 7 09:46:47 2016
@@ -86,7 +86,7 @@ under the License.
<javaVersion>1.7</javaVersion>
<maven.compiler.source>${javaVersion}</maven.compiler.source>
<maven.compiler.target>${javaVersion}</maven.compiler.target>
- <pmdVersion>5.3.5</pmdVersion>
+ <pmdVersion>5.5.1</pmdVersion>
<sitePluginVersion>3.4</sitePluginVersion>
<projectInfoReportsPluginVersion>2.8</projectInfoReportsPluginVersion>
</properties>
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java?rev=1755429&r1=1755428&r2=1755429&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
Sun Aug 7 09:46:47 2016
@@ -114,11 +114,14 @@ public class PmdReport
private boolean skip;
/**
- * The PMD rulesets to use. See the <a
href="http://pmd.sourceforge.net/rules/index.html";>Stock Rulesets</a> for a
- * list of some included. Defaults to the java-basic, java-imports and
java-unusedcode rulesets.
+ * The PMD rulesets to use. See the
+ * <a
href="http://pmd.github.io/pmd-5.5.1/pmd-java/rules/index.html";>Stock Java
Rulesets</a> for a
+ * list of some included. Defaults to the java-basic, java-empty,
java-imports, java-unnecessary
+ * and java-unusedcode rulesets.
*/
@Parameter
- private String[] rulesets = new String[] { "java-basic",
"java-unusedcode", "java-imports" };
+ private String[] rulesets = new String[] { "java-basic", "java-empty",
"java-imports",
+ "java-unnecessary", "java-unusedcode" };
/**
* Controls whether the project's compile/test classpath should be passed
to PMD to enable its type resolution
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/cpd-javascript-plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/cpd-javascript-plugin-config.xml?rev=1755429&r1=1755428&r2=1755429&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/cpd-javascript-plugin-config.xml
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/cpd-javascript-plugin-config.xml
Sun Aug 7 09:46:47 2016
@@ -38,7 +38,7 @@ under the License.
<format>xml</format>
<linkXRef>false</linkXRef>
<xrefLocation>${basedir}/target/test/unit/default-configuration/target/site/xref</xrefLocation>
- <minimumTokens>100</minimumTokens>
+ <minimumTokens>10</minimumTokens>
<language>javascript</language>
<includes>
<include>**/*.js</include>
