Fixed incorrect line breaks (#12040)

Change-Id: Icd97ebd2b54731cf8133b940d024ad8f91c5922f

diff --git a/build/ide.xml b/build/ide.xml
index ab5749edaf80d85cb836f0e76a755434ceb26d29..45130e9d017913ae050d9467baca4ed0c2e96272 100755 (executable)
--- a/build/ide.xml
+++ b/build/ide.xml
@@ -11,8 +11,7 @@
     <property name="gwt.user.super.src" location="${gwt.basedir}/user/super" />
 
     <property name="work.dir" location="work" />
-    <echo>Using gwt files from ${gwt.user.classes} and
-        ${gwt.dev.classes}</echo>
+    <echo>Using gwt files from ${gwt.user.classes} and ${gwt.dev.classes}</echo>
 
     <ivy:resolve file="client-compiler/ivy.xml" conf="ide" />
     <ivy:cachepath pathid="client-compiler.deps" conf="ide" />
@@ -103,9 +102,7 @@
 
         <mkdir dir="${module.output.dir}" />
 
-        <echo>Compiling ${module} to ${module.output.dir} with
-            parameters -logLevel TRACE -style ${style} -localWorkers
-            ${localWorkers} -strict ${extraParams}</echo>
+        <echo>Compiling ${module} to ${module.output.dir} with parameters -logLevel TRACE -style ${style} -localWorkers ${localWorkers} -strict ${extraParams}</echo>
 
         <!--<ivy:resolve inline="true" organisation="javax.validation" module="validation-api" 
             revision="1.0.0.GA"/> -->

diff --git a/common.xml b/common.xml
index 780b90d281ab393f3e5ff9271c68247f70d24aa5..02473b4385cf59d475c839834e4c16a009d74bdf 100644 (file)
--- a/common.xml
+++ b/common.xml
@@ -399,8 +399,7 @@
         <fail unless="cs.src" message="No cs.src parameter given" />
         <property name="result.dir.full" location="${result.dir}" />
         <mkdir dir="${result.dir}" />
-        <echo>##teamcity[importData type='checkstyle'
-            path='${result.dir.full}/checkstyle-errors.xml']</echo>
+        <echo>##teamcity[importData type='checkstyle' path='${result.dir.full}/checkstyle-errors.xml']</echo>
         <cs:checkstyle config="${cs.xml}" failOnViolation="false">
             <fileset dir="${cs.src}" includes="**/*.java">
                 <exclude name="com/vaadin/sass/internal/parser/Parser.java" />

diff --git a/uitest/integration_tests.xml b/uitest/integration_tests.xml
index fbe29c395d57e84cd656b282d15d6688b1cd7d46..7497bb752ee76cd87cfeed1438a2ca251fa626c1 100644 (file)
--- a/uitest/integration_tests.xml
+++ b/uitest/integration_tests.xml
@@ -391,8 +391,7 @@
                         </op>
                     </op>
                 </antcontrib:math>
-                <echo>Delaying startup of ${target-server} with
-                    ${sleepTime} seconds</echo>
+                <echo>Delaying startup of ${target-server} with ${sleepTime} seconds</echo>
                 <sleep seconds="${sleepTime}" />
             </then>
         </antcontrib:if>
@@ -488,8 +487,7 @@
     </target>
 
     <target name="run-generic-integration-test">
-        <concat>##teamcity[testStarted name='${target-server}'
-            flowId='${target-server}']</concat>
+        <concat>##teamcity[testStarted name='${target-server}' flowId='${target-server}']</concat>
         <antcontrib:trycatch property="tried">
             <try>
                 <antcall target="do-run-generic-test" />
@@ -499,14 +497,10 @@
                     <param name="returnTo" value="tried-escaped" />
                     <param name="message" value="${tried}" />
                 </antcontrib:antcallback>
-                <concat>##teamcity[testFailed name='${target-server}'
-                    flowId='${target-server}' message='Integration test
-                    for ${target-server} failed.'
-                    details='${tried-escaped}']</concat>
+                <concat>##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried-escaped}']</concat>
             </catch>
         </antcontrib:trycatch>
-        <concat>##teamcity[testFinished name='${target-server}'
-            flowId='${target-server}']"</concat>
+        <concat>##teamcity[testFinished name='${target-server}' flowId='${target-server}']"</concat>
     </target>
 
     <target name="teamcity-escape">
@@ -523,8 +517,7 @@
     </target>
 
     <target name="run-integration-test">
-        <concat>##teamcity[testStarted name='${target-server}'
-            flowId='${target-server}']</concat>
+        <concat>##teamcity[testStarted name='${target-server}' flowId='${target-server}']</concat>
         <antcontrib:trycatch property="tried">
             <try>
                 <antcall target="integration-test-${target-server}" />
@@ -534,14 +527,10 @@
                     <param name="returnTo" value="tried-escaped" />
                     <param name="message" value="${tried}" />
                 </antcallback>
-                <concat>##teamcity[testFailed name='${target-server}'
-                    flowId='${target-server}' message='Integration test
-                    for ${target-server} failed.'
-                    details='${tried-escaped}']"</concat>
+                <concat>##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried-escaped}']"</concat>
             </catch>
         </antcontrib:trycatch>
-        <concat>##teamcity[testFinished name='${target-server}'
-            flowId='${target-server}']"</concat>
+        <concat>##teamcity[testFinished name='${target-server}' flowId='${target-server}']"</concat>
     </target>
 
     <target name="integration-test-get-lock">