From f6a0fdfdae41d76e9124f0b6f362c51f342c752d Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 28 May 2005 07:49:09 +0000
Subject: [PATCH] Use <j:expr>${... instead of ${... in order to prevent empty
 new lines being printed

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@178860 13f79535-47bb-0310-9956-ffa450edef68
---
 clover/plugin.jelly                                  |  6 +++---
 .../testCloverOffCleansProperly/maven.xml            | 12 +++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/clover/plugin.jelly b/clover/plugin.jelly
index 9c62488b..a07bc41f 100644
--- a/clover/plugin.jelly
+++ b/clover/plugin.jelly
@@ -220,10 +220,10 @@
         enabled="false"/>
     
     <j:set var="maven.build.dest" value="${mavenBuildDestOld}" scope="parent" />
-    ${context.removeVariable('build.compiler')}
+    <j:expr value="${context.removeVariable('build.compiler')}"/>
 
-    ${pom.getPluginContext('maven-test-plugin').setVariable(
-        "maven.test.failure.ignore", ignoreTestFailureOld)}
+    <j:expr value="${pom.getPluginContext('maven-test-plugin').setVariable(
+        'maven.test.failure.ignore', ignoreTestFailureOld)}"/>
     <maven:set plugin="maven-test-plugin" property="maven.junit.fork"
         value="${junitForkOld}"/>
 
diff --git a/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml b/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml
index 1a1d8e6b..414c587e 100644
--- a/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml
+++ b/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml
@@ -41,12 +41,14 @@
     <j:set var="ignoreTestFailureNewNull" value="${ignoreTestFailureNew == null}"/>
     <j:choose>
       <j:when test="${ignoreTestFailureOldNull || ignoreTestFailureNewNull}">
-          <assert:assertEquals expected="${ignoreTestFailureOldNull}" value="${ignoreTestFailureNewNull}"
-              msg="maven.test.failure.ignore is not properly reset"/>
+        <assert:assertEquals expected="${ignoreTestFailureOldNull}" 
+            value="${ignoreTestFailureNewNull}"
+            msg="maven.test.failure.ignore is not properly reset"/>
       </j:when>
       <j:otherwise>
-          <assert:assertEquals expected="${ignoreTestFailureOld}" value="${ignoreTestFailureNew}"
-              msg="maven.test.failure.ignore is not properly reset"/>
+        <assert:assertEquals expected="${ignoreTestFailureOld}" 
+            value="${ignoreTestFailureNew}"
+            msg="maven.test.failure.ignore is not properly reset"/>
       </j:otherwise>
     </j:choose>
 
@@ -60,4 +62,4 @@
 
   </goal>
 
-</project>
\ No newline at end of file
+</project>