Author: aheritier
Date: Fri Feb 3 16:01:46 2006
New Revision: 374791
URL: http://svn.apache.org/viewcvs?rev=374791&view=rev
Log:
Default value for the target jdk was set correctly
Modified:
maven/maven-1/plugins/trunk/pmd/plugin.jelly
maven/maven-1/plugins/trunk/pmd/plugin.properties
Modified: maven/maven-1/plugins/trunk/pmd/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pmd/plugin.jelly?rev=374791&r1=374790&r2=374791&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/pmd/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/pmd/plugin.jelly Fri Feb 3 16:01:46 2006
@@ -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}"
Modified: maven/maven-1/plugins/trunk/pmd/plugin.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pmd/plugin.properties?rev=374791&r1=374790&r2=374791&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/pmd/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/pmd/plugin.properties Fri Feb 3 16:01:46 2006
@@ -51,4 +51,4 @@
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
