Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix it

This commit is contained in:
olivier lamy 2013-02-18 11:27:54 +01:00
parent b66e09f053
commit bbb38efc69
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java
View File

@ -31,7 +31,7 @@ import org.apache.maven.it.util.ResourceExtractor;
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-1830">MNG-1830</a>. * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-1830">MNG-1830</a>.
* *
* @author Brett Porter * @author Brett Porter
* @version $Id$ * @version $Id: ba3c28edf533dba3dfa60e384a670575e0cd6901 $
*/ */
public class MavenITmng1830ShowVersionTest public class MavenITmng1830ShowVersionTest
extends AbstractMavenIntegrationTestCase extends AbstractMavenIntegrationTestCase
@ -58,13 +58,13 @@ public class MavenITmng1830ShowVersionTest
verifier.resetStreams(); verifier.resetStreams();
boolean apacheVersionInTheRightFormatWasFound = false; boolean apacheVersionInTheRightFormatWasFound = false;
List lines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false ); List<String> lines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
for( Iterator i = lines.iterator(); i.hasNext(); ) for( Iterator<String> i = lines.iterator(); i.hasNext(); )
{ {
String line = (String) i.next(); String line = i.next();
if ( line.matches( "^Apache Maven (.*?) \\(r[0-9]+; .*\\)$" ) if ( line.matches( "^Apache Maven (.*?) \\(r[0-9]+; .*\\)$" )
|| line.matches( "^Apache Maven (.*?) \\(rNON-CANONICAL_[-_0-9]+.+?; .*\\)$" ) || line.matches( "^Apache Maven (.*?) \\(rNON-CANONICAL_[-_0-9]+.+?; .*\\)$" )
|| line.matches( "^Apache Maven (.*?) \\([0-9a-f]{5,40}; .*\\)$" ) ) || line.matches( "^Apache Maven (.*?) \\([0-9a-z]{5,41}; .*\\)$" ) )
{ {
apacheVersionInTheRightFormatWasFound = true; apacheVersionInTheRightFormatWasFound = true;
// check timestamp parses // check timestamp parses