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/04/29 19:14:41 UTC

svn commit: r1793231 - in /maven/plugins/trunk/maven-pmd-plugin: pom.xml src/main/java/org/apache/maven/plugin/pmd/ExcludeFromFile.java src/main/java/org/apache/maven/plugin/pmd/PmdReport.java

Author: adangel
Date: Sat Apr 29 19:14:41 2017
New Revision: 1793231

URL: http://svn.apache.org/viewvc?rev=1793231&view=rev
Log:
[MPMD-233] Upgrade to PMD 5.6.1

Modified:
    maven/plugins/trunk/maven-pmd-plugin/pom.xml
    maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/ExcludeFromFile.java
    maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java

Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1793231&r1=1793230&r2=1793231&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Sat Apr 29 19:14:41 2017
@@ -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.5.6</pmdVersion>
+    <pmdVersion>5.6.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/ExcludeFromFile.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/ExcludeFromFile.java?rev=1793231&r1=1793230&r2=1793231&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/ExcludeFromFile.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/ExcludeFromFile.java Sat Apr 29 19:14:41 2017
@@ -33,7 +33,7 @@ public interface ExcludeFromFile<D>
      * @param excludeFromFailureFile the path to the properties file
      * @throws MojoExecutionException if the properties file couldn't be loaded
      */
-    void loadExcludeFromFailuresData( final String excludeFromFailureFile ) throws MojoExecutionException;
+    void loadExcludeFromFailuresData( String excludeFromFailureFile ) throws MojoExecutionException;
 
     /**
      * Determines how many exclusions are considered.
@@ -48,6 +48,6 @@ public interface ExcludeFromFile<D>
      * @param errorDetail the violation to check
      * @return <code>true</code> if the violation should be excluded, <code>false</code> otherwise.
      */
-    boolean isExcludedFromFailure( final D errorDetail );
+    boolean isExcludedFromFailure( D errorDetail );
 
 }

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=1793231&r1=1793230&r2=1793231&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 Sat Apr 29 19:14:41 2017
@@ -445,8 +445,8 @@ public class PmdReport
     private void processFilesWithPMD( PMDConfiguration pmdConfiguration, List<DataSource> dataSources )
             throws MavenReportException
     {
-        RuleSetFactory ruleSetFactory = new RuleSetFactory();
-        ruleSetFactory.setMinimumPriority( RulePriority.valueOf( this.minimumPriority ) );
+        RuleSetFactory ruleSetFactory = new RuleSetFactory( RuleSetFactory.class.getClassLoader(),
+                RulePriority.valueOf( this.minimumPriority ), false, true );
         RuleContext ruleContext = new RuleContext();
 
         try