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
This commit is contained in:
vmassol 2005-05-28 07:49:09 +00:00
parent cbea5e9e54
commit f6a0fdfdae
2 changed files with 10 additions and 8 deletions

View File

@ -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}"/>

View File

@ -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>
</project>