From 28467661118bf54256f0af7f1a2f4c3ca5dac36c Mon Sep 17 00:00:00 2001 From: John Dennis Casey Date: Mon, 27 Apr 2009 13:59:25 +0000 Subject: [PATCH] Allow the use of non-canonical maven buildnumbers (from git repo clones and/or svn exports). git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@768994 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java index 7b4b0182c5..8c4fd3ef67 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java @@ -60,7 +60,7 @@ public class MavenITmng1830ShowVersionTest 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();