maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ltheu...@apache.org
Subject svn commit: r374831 - /maven/maven-1/plugins/trunk/pmd/plugin.jelly
Date Sat, 04 Feb 2006 05:57:31 GMT
Author: ltheussl
Date: Fri Feb  3 21:57:28 2006
New Revision: 374831

URL: http://svn.apache.org/viewcvs?rev=374831&view=rev
Log:
Handle case where maven.compile.source is not set.

Modified:
    maven/maven-1/plugins/trunk/pmd/plugin.jelly

Modified: maven/maven-1/plugins/trunk/pmd/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pmd/plugin.jelly?rev=374831&r1=374830&r2=374831&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/pmd/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/pmd/plugin.jelly Fri Feb  3 21:57:28 2006
@@ -114,8 +114,12 @@
 
     <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"/>
+        <maven:get var="defaultTargetJdk" plugin="maven-java-plugin" property="maven.compile.source"/>
+        <!-- maven.compile.source is not set in java plugin contrary to documentation
-->
+        <j:if test="${defaultTargetJdk == null}">
+          <j:set var="defaultTargetJdk" value="1.3" />
+        </j:if>
+        <maven:property var="targetjdk" name="maven.pmd.targetjdk" defaultValue="${defaultTargetJdk}"/>
         <pmd 
           rulesetfiles="${maven.pmd.rulesetfiles}" 
           printToConsole="${maven.pmd.console}"



Mime
View raw message