You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2012/12/09 01:06:25 UTC
git commit: [MNG-5407] Account for SHA1 in version output by the -v
option
Updated Branches:
refs/heads/master d2fc26066 -> b73b73215
[MNG-5407] Account for SHA1 in version output by the -v option
Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/b73b7321
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/b73b7321
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/b73b7321
Branch: refs/heads/master
Commit: b73b73215021e93476f7c6800e696c1e74e6bd57
Parents: d2fc260
Author: Jason van Zyl <ja...@tesla.io>
Authored: Sat Dec 8 19:03:02 2012 -0500
Committer: Jason van Zyl <ja...@tesla.io>
Committed: Sat Dec 8 19:03:02 2012 -0500
----------------------------------------------------------------------
.../maven/it/MavenITmng1830ShowVersionTest.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b73b7321/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java
index b777dfc..ba3c28e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java
@@ -62,7 +62,9 @@ public class MavenITmng1830ShowVersionTest
for( Iterator i = lines.iterator(); i.hasNext(); )
{
String line = (String) i.next();
- if ( line.matches( "^Apache Maven (.*?) \\(r[0-9]+; .*\\)$" ) || line.matches( "^Apache Maven (.*?) \\(rNON-CANONICAL_[-_0-9]+.+?; .*\\)$" ) )
+ if ( line.matches( "^Apache Maven (.*?) \\(r[0-9]+; .*\\)$" )
+ || line.matches( "^Apache Maven (.*?) \\(rNON-CANONICAL_[-_0-9]+.+?; .*\\)$" )
+ || line.matches( "^Apache Maven (.*?) \\([0-9a-f]{5,40}; .*\\)$" ) )
{
apacheVersionInTheRightFormatWasFound = true;
// check timestamp parses
@@ -75,5 +77,5 @@ public class MavenITmng1830ShowVersionTest
}
assertTrue( apacheVersionInTheRightFormatWasFound );
- }
+ }
}