Fixed PMD report (requires 1.5, but for REPORT ONLY); Added CPD report

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@744925 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 15 insertions, 10 deletions

diff --git a/build.xml b/build.xml
index b3e2b86dd..63bebb9b8 100644
--- a/build.xml
+++ b/build.xml
@@ -1108,23 +1108,28 @@ NOTE:
     </taskdef>
     <pmd shortFilenames="true" targetjdk="${javac.target}">
       <ruleset>basic</ruleset>
-      <ruleset>braces</ruleset>
-      <ruleset>codesize</ruleset>
-      <ruleset>clone</ruleset>
-      <ruleset>design</ruleset>
-      <ruleset>finalizers</ruleset>
-      <ruleset>imports</ruleset>
-      <ruleset>strings</ruleset>
       <ruleset>rulesets/migrating_to_14.xml</ruleset>
-      <ruleset>optimizations</ruleset>
       <ruleset>sunsecure</ruleset>
-      <ruleset>unusedcode</ruleset>
       <formatter type="html" toFile="${build.dir}/report_pmd.html"/>
       <fileset dir="${src.java.dir}">
         <include name="**/*.java"/>
       </fileset>
     </pmd>
   </target>
+  
+  <target name="cpd" depends="init" description="Runs PMD/CDP for a code quality report">
+    <taskdef name="cpd" classname="net.sourceforge.pmd.cpd.CPDTask">
+      <classpath>
+        <path refid="libs-build-classpath"/>
+        <path refid="libs-build-tools-classpath"/>
+      </classpath>
+    </taskdef>
+     <cpd minimumTokenCount="100" outputFile="${build.dir}/report_cpd.txt">
+      <fileset dir="${src.java.dir}">
+         <include name="**/*.java"/>
+      </fileset>
+    </cpd>
+  </target>
 <!-- =================================================================== -->
 <!-- Findbugs                                                            -->
 <!-- =================================================================== -->
@@ -1147,7 +1152,7 @@ NOTE:
 <!-- =================================================================== -->
 <!-- Creates the reports                                                 -->
 <!-- =================================================================== -->
-  <target name="reports" depends="checkstyle, pmd, findbugs" description="Runs all configured code quality reports"/>
+  <target name="reports" depends="checkstyle, pmd, cpd, findbugs" description="Runs all configured code quality reports"/>
 <!-- =================================================================== -->
 <!-- Creates the documentation                                           -->
 <!-- =================================================================== -->
diff --git a/lib/build/pmd-4.2.5.jar b/lib/build/pmd-4.2.5.jar
new file mode 100644
index 000000000..986ad2010
--- /dev/null
+++ b/lib/build/pmd-4.2.5.jar
diff --git a/lib/build/pmd14-4.2.2.jar b/lib/build/pmd14-4.2.2.jar
deleted file mode 100644
index 6321a18ae..000000000
--- a/lib/build/pmd14-4.2.2.jar
+++ /dev/null