From 4595bdd24b2d56ee86e82e4347e8dc7ac5fd814a Mon Sep 17 00:00:00 2001
From: Andreas Dangel <adangel@users.sourceforge.net>
Date: Fri, 3 Apr 2015 10:37:10 +0200
Subject: [PATCH 1/2] [MPMD-209] Upgrade to PMD 5.3.0

---
 maven-pmd-plugin/pom.xml                                   | 2 +-
 .../org/apache/maven/plugin/pmd/CpdReportGenerator.java    | 5 +++--
 .../java/org/apache/maven/plugin/pmd/CpdReportTest.java    | 7 +++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/maven-pmd-plugin/pom.xml b/maven-pmd-plugin/pom.xml
index 1e47f6ac70..36ebee433d 100644
--- a/maven-pmd-plugin/pom.xml
+++ b/maven-pmd-plugin/pom.xml
@@ -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.0</pmdVersion>
     <sitePluginVersion>3.4</sitePluginVersion>
     <projectInfoReportsPluginVersion>2.8</projectInfoReportsPluginVersion>
   </properties>
diff --git a/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java b/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java
index 756a5dd223..4a3d95ba53 100644
--- a/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java
+++ b/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java
@@ -24,6 +24,7 @@
 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 void generate( Iterator<Match> matches )
             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 );
             }
 
diff --git a/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java b/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
index ba342ad2c5..617ddb821a 100644
--- a/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
+++ b/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
@@ -33,6 +33,7 @@
 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 void testWriteNonHtml()
         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();

From 5bd46b697b1290401cf08e3ac80f2e60d1e442e5 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <adangel@users.sourceforge.net>
Date: Mon, 20 Apr 2015 21:59:43 +0200
Subject: [PATCH 2/2] [MPMD-209] Upgrade to PMD 5.3.1

---
 maven-pmd-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maven-pmd-plugin/pom.xml b/maven-pmd-plugin/pom.xml
index 36ebee433d..d5fe2a95f9 100644
--- a/maven-pmd-plugin/pom.xml
+++ b/maven-pmd-plugin/pom.xml
@@ -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.3.0</pmdVersion>
+    <pmdVersion>5.3.1</pmdVersion>
     <sitePluginVersion>3.4</sitePluginVersion>
     <projectInfoReportsPluginVersion>2.8</projectInfoReportsPluginVersion>
   </properties>