From 9d730f9fbc2ab523776274189f1ea43fe04714ce Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 4 Feb 2006 00:01:46 +0000
Subject: [PATCH] Default value for the target jdk was set correctly

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@374791 13f79535-47bb-0310-9956-ffa450edef68
---
 pmd/plugin.jelly      | 6 ++++--
 pmd/plugin.properties | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pmd/plugin.jelly b/pmd/plugin.jelly
index 6e58d92c..859b3c9a 100644
--- a/pmd/plugin.jelly
+++ b/pmd/plugin.jelly
@@ -23,7 +23,7 @@
     PMD Plugin. Generate PMD reports using the PMD framework.
   =============================================================================
 -->
-<project xmlns:j="jelly:core" xmlns:doc="doc" xmlns:ant="jelly:ant" xmlns:util="jelly:util">
+<project xmlns:j="jelly:core" xmlns:doc="doc" xmlns:ant="jelly:ant" xmlns:util="jelly:util" xmlns:maven="jelly:maven">
 
   <!--
      ========================================================================
@@ -114,12 +114,14 @@
 
     <j:choose>
       <j:when test="${sourcesPresent == 'true'}">
+	    <maven:get var="defaultTargetJdk" plugin="maven-java-plugin" property="maven.compile.source"/>
+	    <maven:property var="targetjdk" name="maven.pmd.targetjdk" defaultValue="defaultTargetJdk"/>
         <pmd 
           rulesetfiles="${maven.pmd.rulesetfiles}" 
           printToConsole="${maven.pmd.console}"
           failonerror="${maven.pmd.failonerror}"
           failOnRuleViolation="${maven.pmd.failonruleviolation}"
-          targetjdk="${maven.pmd.targetjdk}">
+          targetjdk="${targetjdk}">
           <formatter type="xml" toFile="${maven.build.dir}/pmd-raw-report.xml"/>
           <fileset dir="${pom.build.sourceDirectory}" 
             includes="${maven.pmd.includes}"
diff --git a/pmd/plugin.properties b/pmd/plugin.properties
index 7c119941..4d236153 100644
--- a/pmd/plugin.properties
+++ b/pmd/plugin.properties
@@ -51,4 +51,4 @@ maven.pmd.failonerror = false
 maven.pmd.failonruleviolation = false
 
 # JDK target
-maven.pmd.targetjdk = ${maven.compile.source}
\ No newline at end of file
+maven.pmd.targetjdk=${maven.compile.source}
\ No newline at end of file