merged all changes up to...

merged all changes up to https://github.com/apache/maven-3/commit/ab6e3f0e0683e0c3f3558ad1dc186927beb5dda6

maven-plugin/src/main/java/hudson/maven/util/ExecutionEventLogger.java

@@ -22,10 +22,7 @@ package hudson.maven.util;
 import hudson.tasks._maven.Maven3MojoNote;
 
 import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.TimeZone;
 
 import org.apache.maven.execution.AbstractExecutionListener;
 import org.apache.maven.execution.BuildFailure;
@@ -43,6 +40,7 @@ import org.codehaus.plexus.logging.Logger;
  *
  * @author Benjamin Bentmann
  */
+// Note: copied from package org.apache.maven.cli with just one minor adaption for Maven3MojoNote
 public class ExecutionEventLogger
     extends AbstractExecutionListener
 {
@@ -74,22 +72,28 @@ public class ExecutionEventLogger
 
     private static String getFormattedTime( long time )
     {
-        String pattern = "s.SSS's'";
+        // NOTE: DateFormat is not suitable to format timespans of 24h+
 
-        if ( time / 60000L > 0 )
-        {
-            pattern = "m:s" + pattern;
+        long h = time / ( 60 * 60 * 1000 );
+        long m = ( time - h * 60 * 60 * 1000 ) / ( 60 * 1000 );
+        long s = ( time - h * 60 * 60 * 1000 - m * 60 * 1000 ) / 1000;
+        long ms = time % 1000;
 
-            if ( time / 3600000L > 0 )
-            {
-                pattern = "H:m" + pattern;
-            }
+        String format;
+        if ( h > 0 )
+        {
+            format = "%1$d:%2$02d:%3$02d.%4$03ds";
+        }
+        else if ( m > 0 )
+        {
+            format = "%2$d:%3$02d.%4$03ds";
+        }
+        else
+        {
+            format = "%3$d.%4$03ds";
         }
 
-        DateFormat fmt = new SimpleDateFormat( pattern );
-        fmt.setTimeZone( TimeZone.getTimeZone( "UTC" ) );
-
-        return fmt.format( new Date( time ) );
+        return String.format( format, h, m, s, ms );
     }
 
     @Override
@@ -259,6 +263,9 @@ public class ExecutionEventLogger
         }
     }
 
+    /**
+     * <pre>--- mojo-artifactId:version:goal (mojo-executionId) @ project-artifactId ---</pre>
+     */
     @Override
     public void mojoStarted( ExecutionEvent event )
     {
@@ -276,11 +283,15 @@ public class ExecutionEventLogger
             append( buffer, event.getMojoExecution() );
             append( buffer, event.getProject() );
             buffer.append( " ---" );
+
             logger.info( "" );
             logger.info( buffer.toString() );
         }
     }
 
+    /**
+     * <pre>>>> mojo-artifactId:version:goal (mojo-executionId) @ project-artifactId >>></pre>
+     */
     @Override
     public void forkStarted( ExecutionEvent event )
     {
@@ -298,6 +309,9 @@ public class ExecutionEventLogger
         }
     }
 
+    /**
+     * <pre>&lt;&lt;&lt; mojo-artifactId:version:goal (mojo-executionId) @ project-artifactId &lt;&lt;&lt;</pre>
+     */
     @Override
     public void forkSucceeded( ExecutionEvent event )
     {