svn commit: r516680 - /maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java

[ha...@apache.org]

Author: handyande
Date: Sat Mar 10 03:06:26 2007
New Revision: 516680

URL: http://svn.apache.org/viewvc?view=rev&rev=516680
Log:
Don't fail silently (our sout / serr are being consumed) if the maven script has lines above 'Maven version' the jdk or script interpreter could output a line, which we don't care about.

Modified:
    maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java

Modified: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java?view=diff&rev=516680&r1=516679&r2=516680
==============================================================================
--- maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java (original)
+++ maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java Sat Mar 10 03:06:26 2007
@@ -973,13 +973,23 @@
 
         List l = loadFile( log, false );
 
-        String first = (String) l.get( 0 );
-        if ( !first.startsWith( "Maven version: " ) )
+        Iterator lines = l.iterator();
+        String version = (String) lines.next();
+        boolean matched = false;
+
+        while ( !version.startsWith( "Maven version: " ) && lines.hasNext() )
+        {
+            version = (String) lines.next();
+            matched = true;
+            break;
+        }
+
+        if ( !matched )
         {
-            throw new VerificationException( "Illegal maven output: expecting 'Maven version: ' but got " + first );
+            throw new VerificationException( "Illegal maven output: expecting 'Maven version: ' but got " + l.get( 0 ) );
         }
 
-        return first.substring( "Maven version: ".length() ).trim();
+        return version.substring( "Maven version: ".length() ).trim();
     }