diff --git a/src/java/org/apache/ivy/plugins/parser/m2/m2-entities.ent b/src/java/org/apache/ivy/plugins/parser/m2/m2-entities.ent
index ae1ba092e..efd009fe6 100644
--- a/src/java/org/apache/ivy/plugins/parser/m2/m2-entities.ent
+++ b/src/java/org/apache/ivy/plugins/parser/m2/m2-entities.ent
@@ -14,7 +14,7 @@
    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
    KIND, either express or implied.  See the License for the
    specific language governing permissions and limitations
-   under the License.    
+   under the License.
 -->
 <!ENTITY nbsp   "&#160;">
 <!ENTITY iexcl  "&#161;">
diff --git a/src/java/org/apache/ivy/plugins/report/ivy-report.xsl b/src/java/org/apache/ivy/plugins/report/ivy-report.xsl
index c8ff98211..3c9c2c19f 100644
--- a/src/java/org/apache/ivy/plugins/report/ivy-report.xsl
+++ b/src/java/org/apache/ivy/plugins/report/ivy-report.xsl
@@ -15,36 +15,36 @@
    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
    KIND, either express or implied.  See the License for the
    specific language governing permissions and limitations
-   under the License.    
+   under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-<xsl:param name="confs"    select="/ivy-report/info/@confs"/>
-<xsl:param name="extension"    select="'xml'"/>
+<xsl:param name="confs" select="/ivy-report/info/@confs"/>
+<xsl:param name="extension" select="'xml'"/>
 
-<xsl:variable name="myorg"    select="/ivy-report/info/@organisation"/>
-<xsl:variable name="mymod"    select="/ivy-report/info/@module"/>
-<xsl:variable name="myconf"   select="/ivy-report/info/@conf"/>
+<xsl:variable name="myorg" select="/ivy-report/info/@organisation"/>
+<xsl:variable name="mymod" select="/ivy-report/info/@module"/>
+<xsl:variable name="myconf" select="/ivy-report/info/@conf"/>
 
-<xsl:variable name="modules"    select="/ivy-report/dependencies/module"/>
-<xsl:variable name="conflicts"    select="$modules[count(revision) > 1]"/>
+<xsl:variable name="modules" select="/ivy-report/dependencies/module"/>
+<xsl:variable name="conflicts" select="$modules[count(revision) > 1]"/>
 
-<xsl:variable name="revisions"  select="$modules/revision"/>
-<xsl:variable name="evicteds"   select="$revisions[@evicted]"/>
-<xsl:variable name="downloadeds"   select="$revisions[@downloaded='true']"/>
-<xsl:variable name="searcheds"   select="$revisions[@searched='true']"/>
-<xsl:variable name="errors"   select="$revisions[@error]"/>
+<xsl:variable name="revisions" select="$modules/revision"/>
+<xsl:variable name="evicteds" select="$revisions[@evicted]"/>
+<xsl:variable name="downloadeds" select="$revisions[@downloaded='true']"/>
+<xsl:variable name="searcheds" select="$revisions[@searched='true']"/>
+<xsl:variable name="errors" select="$revisions[@error]"/>
 
-<xsl:variable name="artifacts"   select="$revisions/artifacts/artifact"/>
+<xsl:variable name="artifacts" select="$revisions/artifacts/artifact"/>
 <xsl:variable name="cacheartifacts" select="$artifacts[@status='no']"/>
 <xsl:variable name="dlartifacts" select="$artifacts[@status='successful']"/>
 <xsl:variable name="faileds" select="$artifacts[@status='failed']"/>
 <xsl:variable name="artifactsok" select="$artifacts[@status!='failed']"/>
 
 <xsl:template name="calling">
-    <xsl:param name="org" />
-    <xsl:param name="mod" />
-    <xsl:param name="rev" />
+    <xsl:param name="org"/>
+    <xsl:param name="mod"/>
+    <xsl:param name="rev"/>
     <xsl:if test="count($modules/revision/caller[(@organisation=$org and @name=$mod) and @callerrev=$rev]) = 0">
     <table><tr><td>
     No dependency
@@ -67,11 +67,11 @@
       <tbody>
       <xsl:for-each select="$modules/revision/caller[(@organisation=$org and @name=$mod) and @callerrev=$rev]">
           <xsl:call-template name="called">
-              <xsl:with-param name="callstack"     select="concat($org, string('/'), $mod)"/>
-              <xsl:with-param name="indent"        select="string('')"/>
-              <xsl:with-param name="revision"      select=".."/>
+              <xsl:with-param name="callstack" select="concat($org, string('/'), $mod)"/>
+              <xsl:with-param name="indent"    select="string('')"/>
+              <xsl:with-param name="revision"  select=".."/>
           </xsl:call-template>
-      </xsl:for-each>   
+      </xsl:for-each>
       </tbody>
     </table>
     </xsl:if>
@@ -115,7 +115,7 @@
     </td>
     <td align="center">
     <xsl:call-template name="licenses">
-        <xsl:with-param name="revision"      select="$revision"/>
+        <xsl:with-param name="revision" select="$revision"/>
     </xsl:call-template>
     </td>
     <td align="center">
@@ -123,20 +123,20 @@
     </td>
     <td align="center">
     <xsl:call-template name="icons">
-        <xsl:with-param name="revision"      select="$revision"/>
+        <xsl:with-param name="revision" select="$revision"/>
     </xsl:call-template>
     </td>
     </tr>
     <xsl:if test="not($revision/@evicted)">
-	<xsl:if test="not(contains($callstack, concat($organisation, string('/'), $module)))">
-	    <xsl:for-each select="$modules/revision/caller[(@organisation=$organisation and @name=$module) and @callerrev=$rev]">
-		<xsl:call-template name="called">
-		    <xsl:with-param name="callstack"     select="concat($callstack, string('#'), $organisation, string('/'), $module)"/>
-		    <xsl:with-param name="indent"        select="concat($indent, string('---'))"/>
-		    <xsl:with-param name="revision"      select=".."/>
-		</xsl:call-template>
-	    </xsl:for-each>   
-	</xsl:if>
+        <xsl:if test="not(contains($callstack, concat($organisation, string('/'), $module)))">
+            <xsl:for-each select="$modules/revision/caller[(@organisation=$organisation and @name=$module) and @callerrev=$rev]">
+                <xsl:call-template name="called">
+                    <xsl:with-param name="callstack" select="concat($callstack, string('#'), $organisation, string('/'), $module)"/>
+                    <xsl:with-param name="indent"    select="concat($indent, string('---'))"/>
+                    <xsl:with-param name="revision"  select=".."/>
+                </xsl:call-template>
+            </xsl:for-each>
+        </xsl:if>
     </xsl:if>
 </xsl:template>
 
@@ -209,7 +209,7 @@
 
 <xsl:template name="confs">
     <xsl:param name="configurations"/>
-    
+
     <xsl:if test="contains($configurations, ',')">
         <xsl:call-template name="conf">
             <xsl:with-param name="conf" select="normalize-space(substring-before($configurations,','))"/>
@@ -227,7 +227,7 @@
 
 <xsl:template name="conf">
     <xsl:param name="conf"/>
-    
+
      <li>
      <xsl:element name="a">
          <xsl:if test="$conf = $myconf">
@@ -241,7 +241,7 @@
 
 <xsl:template name="date">
     <xsl:param name="date"/>
-    
+
     <xsl:value-of select="substring($date,1,4)"/>-<xsl:value-of select="substring($date,5,2)"/>-<xsl:value-of select="substring($date,7,2)"/>
     <xsl:value-of select="' '"/>
     <xsl:value-of select="substring($date,9,2)"/>:<xsl:value-of select="substring($date,11,2)"/>:<xsl:value-of select="substring($date,13)"/>
@@ -253,10 +253,10 @@
   <html>
   <head>
     <title>Ivy report :: <xsl:value-of select="info/@module"/> by <xsl:value-of select="info/@organisation"/> :: <xsl:value-of select="info/@conf"/></title>
-    <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-    <meta http-equiv="content-language" content="en" />
-    <meta name="robots" content="index,follow" />
-    <link rel="stylesheet" type="text/css" href="ivy-report.css" /> 
+    <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"/>
+    <meta http-equiv="content-language" content="en"/>
+    <meta name="robots" content="index,follow"/>
+    <link rel="stylesheet" type="text/css" href="ivy-report.css"/>
   </head>
   <body>
     <div id="logo"><a href="http://ant.apache.org/ivy/"><img src="http://ant.apache.org/ivy/images/logo.png"/></a></div>
@@ -266,14 +266,14 @@
     </xsl:element>
     <span id="module">
         <xsl:value-of select="concat(info/@module, ' ', info/@revision)"/>
-    </span> 
-    by 
+    </span>
+    by
     <span id="organisation">
         <xsl:value-of select="info/@organisation"/>
     </span>
     </h1>
     <div id="date">
-        resolved on 
+        resolved on
         <xsl:call-template name="date">
             <xsl:with-param name="date" select="info/@date"/>
         </xsl:call-template>
@@ -288,19 +288,19 @@
     <h2>Dependencies Stats</h2>
     <table class="header">
         <tr><td class="title">Modules</td><td class="value"><xsl:value-of select="count($modules)"/></td></tr>
-        <tr><td class="title">Revisions</td><td class="value"><xsl:value-of select="count($revisions)"/>  
+        <tr><td class="title">Revisions</td><td class="value"><xsl:value-of select="count($revisions)"/>
         (<xsl:value-of select="count($searcheds)"/> searched <img src="http://ant.apache.org/ivy/images/searched.gif" alt="searched" title="module revisions which required a search with a dependency resolver to be resolved"/>,
         <xsl:value-of select="count($downloadeds)"/> downloaded <img src="http://ant.apache.org/ivy/images/downloaded.gif" alt="downloaded" title="module revisions for which ivy file was downloaded by dependency resolver"/>,
         <xsl:value-of select="count($evicteds)"/> evicted <img src="http://ant.apache.org/ivy/images/evicted.gif" alt="evicted" title="module revisions which were evicted by others"/>,
         <xsl:value-of select="count($errors)"/> errors <img src="http://ant.apache.org/ivy/images/error.gif" alt="error" title="module revisions on which error occurred"/>)</td></tr>
-        <tr><td class="title">Artifacts</td><td class="value"><xsl:value-of select="count($artifacts)"/> 
+        <tr><td class="title">Artifacts</td><td class="value"><xsl:value-of select="count($artifacts)"/>
         (<xsl:value-of select="count($dlartifacts)"/> downloaded,
         <xsl:value-of select="count($faileds)"/> failed)</td></tr>
         <tr><td class="title">Artifacts size</td><td class="value"><xsl:value-of select="round(sum($artifacts/@size) div 1024)"/> kB
         (<xsl:value-of select="round(sum($dlartifacts/@size) div 1024)"/> kB downloaded,
         <xsl:value-of select="round(sum($cacheartifacts/@size) div 1024)"/> kB in cache)</td></tr>
     </table>
-    
+
     <xsl:if test="count($errors) > 0">
     <h2>Errors</h2>
     <table class="errors">
@@ -314,9 +314,9 @@
       <tbody>
       <xsl:for-each select="$errors">
           <xsl:call-template name="error">
-              <xsl:with-param name="organisation"  select="../@organisation"/>
-              <xsl:with-param name="module"        select="../@name"/>
-              <xsl:with-param name="revision"      select="@name"/>
+              <xsl:with-param name="organisation" select="../@organisation"/>
+              <xsl:with-param name="module"       select="../@name"/>
+              <xsl:with-param name="revision"     select="@name"/>
               <xsl:with-param name="error"        select="@error"/>
           </xsl:call-template>
       </xsl:for-each>
@@ -335,7 +335,7 @@
       </tr>
       </thead>
       <tbody>
-	  <xsl:for-each select="$conflicts">
+      <xsl:for-each select="$conflicts">
         <tr>
         <td>
         <xsl:element name="a">
@@ -357,10 +357,10 @@
         <td>
         <xsl:for-each select="revision[@evicted]">
             <xsl:element name="a">
-		<xsl:attribute name="href">#<xsl:value-of select="../@organisation"/>-<xsl:value-of select="../@name"/>-<xsl:value-of select="@name"/></xsl:attribute>
-		<xsl:value-of select="@name"/>
+                <xsl:attribute name="href">#<xsl:value-of select="../@organisation"/>-<xsl:value-of select="../@name"/>-<xsl:value-of select="@name"/></xsl:attribute>
+                <xsl:value-of select="@name"/>
                 <xsl:text> </xsl:text>
-		<xsl:value-of select="@evicted-reason"/>
+                <xsl:value-of select="@evicted-reason"/>
             </xsl:element>
             <xsl:text> </xsl:text>
         </xsl:for-each>
@@ -378,14 +378,14 @@
           <xsl:with-param name="rev" select="info/@revision"/>
         </xsl:call-template>
 
-    <h2>Details</h2>    
+    <h2>Details</h2>
     <xsl:for-each select="$modules">
     <h3>
       <xsl:element name="a">
          <xsl:attribute name="name"><xsl:value-of select="@organisation"/>-<xsl:value-of select="@name"/></xsl:attribute>
       </xsl:element>
       <xsl:value-of select="@name"/> by <xsl:value-of select="@organisation"/>
-    </h3>    
+    </h3>
       <xsl:for-each select="revision">
         <h4>
           <xsl:element name="a">
@@ -394,7 +394,7 @@
            Revision: <xsl:value-of select="@name"/>
           <span style="padding-left:15px;">
           <xsl:call-template name="icons">
-            <xsl:with-param name="revision"      select="."/>
+            <xsl:with-param name="revision" select="."/>
           </xsl:call-template>
           </span>
         </h4>
@@ -405,7 +405,7 @@
                     <xsl:attribute name="href"><xsl:value-of select="@homepage"/></xsl:attribute>
                         <xsl:value-of select="@homepage"/>
                 </xsl:element></td>
-            </tr>               
+            </tr>
                 </xsl:if>
           <tr><td class="title">Status</td><td class="value"><xsl:value-of select="@status"/></td></tr>
           <tr><td class="title">Publication</td><td class="value"><xsl:value-of select="@pubdate"/></td></tr>
@@ -417,15 +417,15 @@
           <xsl:if test="count(license) > 0">
               <tr><td class="title">Licenses</td><td class="value">
               <xsl:call-template name="licenses">
-                  <xsl:with-param name="revision"      select="."/>
+                  <xsl:with-param name="revision" select="."/>
               </xsl:call-template>
-            </td></tr>                  
+            </td></tr>
           </xsl:if>
           <xsl:if test="@evicted">
-          <tr><td class="title">Evicted by</td><td class="value">  
+          <tr><td class="title">Evicted by</td><td class="value">
           <b>
               <xsl:for-each select="evicted-by">
-		  <xsl:value-of select="@rev"/>
+                  <xsl:value-of select="@rev"/>
                   <xsl:text> </xsl:text>
               </xsl:for-each>
           </b>
@@ -460,11 +460,11 @@
               <td><xsl:value-of select="@conf"/></td>
               <td><xsl:value-of select="@rev"/></td>
               </tr>
-            </xsl:for-each>   
+            </xsl:for-each>
           </tbody>
         </table>
         <xsl:if test="not(@evicted)">
-        
+
         <h5>Dependencies</h5>
         <xsl:call-template name="calling">
             <xsl:with-param name="org" select="../@organisation"/>
@@ -497,13 +497,13 @@
               <td align="center"><xsl:value-of select="@status"/></td>
               <td align="center"><xsl:value-of select="round(number(@size) div 1024)"/> kB</td>
               </tr>
-          </xsl:for-each>    
+          </xsl:for-each>
           </tbody>
         </table>
         </xsl:if>
-        
+
         </xsl:if>
-      </xsl:for-each>    
+      </xsl:for-each>
     </xsl:for-each>
     </div>
   </body>