Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 41069 invoked from network); 27 Apr 2009 13:59:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 27 Apr 2009 13:59:47 -0000 Received: (qmail 85426 invoked by uid 500); 27 Apr 2009 13:59:47 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 85348 invoked by uid 500); 27 Apr 2009 13:59:47 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 85339 invoked by uid 99); 27 Apr 2009 13:59:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Apr 2009 13:59:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Apr 2009 13:59:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2A51B2388B8B; Mon, 27 Apr 2009 13:59:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r768994 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java Date: Mon, 27 Apr 2009 13:59:26 -0000 To: commits@maven.apache.org From: jdcasey@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090427135926.2A51B2388B8B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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();