svn commit: r1682376 - in /maven/plugins/trunk/maven-pmd-plugin: pom.xml src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java

[de...@apache.org]

Author: dennisl
Date: Fri May 29 07:08:39 2015
New Revision: 1682376

URL: http://svn.apache.org/r1682376
Log:
[MPMD-209] Upgrade to PMD 5.3.1
Submitted by: Andreas Dangel
Reviewed by: Dennis Lundberg

Modified:
    maven/plugins/trunk/maven-pmd-plugin/pom.xml
    maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java
    maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.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=1682376&r1=1682375&r2=1682376&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Fri May 29 07:08:39 2015
@@ -86,7 +86,7 @@ under the License.
     <javaVersion>1.6</javaVersion>
     <maven.compiler.source>${javaVersion}</maven.compiler.source>
     <maven.compiler.target>${javaVersion}</maven.compiler.target>
-    <pmdVersion>5.2.3</pmdVersion>
+    <pmdVersion>5.3.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/CpdReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java?rev=1682376&r1=1682375&r2=1682376&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java Fri May 29 07:08:39 2015
@@ -24,6 +24,7 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.ResourceBundle;
 
+import net.sourceforge.pmd.cpd.Mark;
 import net.sourceforge.pmd.cpd.Match;
 import net.sourceforge.pmd.cpd.TokenEntry;
 
@@ -185,10 +186,10 @@ public class CpdReportGenerator
             sink.tableRow_();
 
             // Iterating on every token entry
-            for ( Iterator<TokenEntry> occurrences = match.iterator(); occurrences.hasNext(); )
+            for ( Iterator<Mark> occurrences = match.iterator(); occurrences.hasNext(); )
             {
 
-                TokenEntry mark = occurrences.next();
+                TokenEntry mark = occurrences.next().getToken();
                 generateFileLine( mark );
             }
 

Modified: maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java?rev=1682376&r1=1682375&r2=1682376&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java Fri May 29 07:08:39 2015
@@ -33,6 +33,7 @@ import javax.xml.parsers.DocumentBuilder
 import net.sourceforge.pmd.cpd.CPD;
 import net.sourceforge.pmd.cpd.CPDConfiguration;
 import net.sourceforge.pmd.cpd.JavaLanguage;
+import net.sourceforge.pmd.cpd.Mark;
 import net.sourceforge.pmd.cpd.Match;
 import net.sourceforge.pmd.cpd.TokenEntry;
 
@@ -196,8 +197,10 @@ public class CpdReportTest
         TokenEntry tFirstEntry = new TokenEntry( "public java", "MyClass.java", 34 );
         TokenEntry tSecondEntry = new TokenEntry( "public java", "MyClass3.java", 55 );
         List<Match> tList = new ArrayList<Match>();
-        Match tMatch = new Match( 2, tFirstEntry, tSecondEntry );
-        tMatch.setSourceCodeSlice( "// ----- ACCESSEURS  avec �l�ments -----" );
+        Mark tFirstMark = new Mark( tFirstEntry );
+        Mark tSecondMark = new Mark( tSecondEntry );
+        tFirstMark.setSoureCodeSlice( "// ----- ACCESSEURS  avec �l�ments -----" );
+        Match tMatch = new Match( 2, tFirstMark, tSecondMark );
         tList.add( tMatch );
 
         CPDConfiguration cpdConfiguration = new CPDConfiguration();