You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@maven.apache.org by jd...@apache.org on 2009/04/27 15:59:26 UTC

svn commit: r768994 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java

Author: jdcasey
Date: Mon Apr 27 13:59:25 2009
New Revision: 768994

URL: http://svn.apache.org/viewvc?rev=768994&view=rev
Log:
Allow the use of non-canonical maven buildnumbers (from git repo clones and/or svn exports).

Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java?rev=768994&r1=768993&r2=768994&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java Mon Apr 27 13:59:25 2009
@@ -60,7 +60,7 @@
         verifier.resetStreams();
 
         String line = (String) verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false ).get( 1 );
-        assertTrue( line, line.matches( "^Apache Maven (.*?) \\(r[0-9]+; .*\\)$" ) );
+        assertTrue( line, line.matches( "^Apache Maven (.*?) \\(r[0-9]+; .*\\)$" ) || line.matches( "^Apache Maven (.*?) \\(rNON-CANONICAL_[-_0-9]+.+?; .*\\)$" ) );
 
         // check timestamp parses
         String timestamp = line.substring( line.lastIndexOf( ';' ) + 1, line.length() - 1 ).trim();