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

[dkulp]

Author: dkulp
Date: Thu Nov 29 14:09:50 2007
New Revision: 599597

URL: http://svn.apache.org/viewvc?rev=599597&view=rev
Log:
[MPMD-59] Update to PMD 4.1 (patch from Xavier Le Vourch applied with other 
fixes needed)

Modified:
    maven/plugins/trunk/maven-pmd-plugin/pom.xml
    
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java
    
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.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=599597&r1=599596&r2=599597&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Thu Nov 29 14:09:50 2007
@@ -103,10 +103,9 @@
     <dependency>
       <groupId>pmd</groupId>
       <artifactId>pmd</artifactId>
-      <version>3.9</version>
+      <version>4.1</version>
       <exclusions>
-          <!-- 3.9 specifies a beta version of jaxen which doesn't have a pom 
resulting in
-                a warning whenever you use it.  Likewise for xom 1.0. -->
+          <!-- incorrect jaxen version in pom for 4.1 -->
           <exclusion>
              <groupId>jaxen</groupId>
              <artifactId>jaxen</artifactId>
@@ -116,18 +115,7 @@
     <dependency>
       <groupId>jaxen</groupId>
       <artifactId>jaxen</artifactId>
-      <version>1.1</version>
-      <exclusions>
-        <exclusion>
-          <groupId>xom</groupId>
-          <artifactId>xom</artifactId>
-         </exclusion>
-       </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>xom</groupId>
-      <artifactId>xom</artifactId>
-      <version>1.1</version>
+      <version>1.1.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>

Modified: 
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java?rev=599597&r1=599596&r2=599597&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java
 (original)
+++ 
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java
 Thu Nov 29 14:09:50 2007
@@ -182,7 +182,7 @@
         Renderer renderer = null;
         if ( "xml".equals( format ) )
         {
-            renderer = new XMLRenderer();
+            renderer = new XMLRenderer("UTF-8");
         }
         else if ( "csv".equals( format ) )
         {

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=599597&r1=599596&r2=599597&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
 Thu Nov 29 14:09:50 2007
@@ -257,7 +257,10 @@
                     
                     try
                     {
-                        r.render( stringwriter, report );
+                        r.setWriter(stringwriter);
+                        r.start();
+                        r.renderFileReport(report);
+                        r.end();
                         String buffer = stringwriter.toString();
                         
                         Writer writer = new FileWriter( new File( 
targetDirectory, "pmd." + format ) );

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=599597&r1=599596&r2=599597&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
 Thu Nov 29 14:09:50 2007
@@ -195,6 +195,7 @@
 
         CPD tCpd = new MockCpd( 100, new JavaLanguage(), tList.iterator() );
 
+        tCpd.go();
         mojo.writeNonHtml( tCpd );
 
         File tReport = new File( 
"target/test/unit/default-configuration/target/cpd.xml" );