Adjust the version parser to handle extra data at the end of
the Gerrit version. The qualifier area.
ex: 2.14.6-54-ge539946
Adjust the oxygen target platform.
Change-Id: Ieb2eb0e59365da8da4339d98d86352a0d2c23a7e
Signed-off-by: Jacques Bouthillier <lmcbout@gmail.com>
diff --git a/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/GerritRepository.java b/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/GerritRepository.java
index 54afe05..c2586c2 100644
--- a/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/GerritRepository.java
+++ b/org.eclipse.egerrit.core/src/org/eclipse/egerrit/internal/core/GerritRepository.java
@@ -363,7 +363,9 @@
Matcher matcher = MAJOR_MINOR_MICRO_VERSION_PATTERN.matcher(rawVersion);
if (matcher.matches()) {
- return new Version(rawVersion);
+ // Try to math a major-minor-micro with any other string attach (2.14.6-54-ge539946) as qualifier
+ return new Version(Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2)),
+ Integer.parseInt(matcher.group(3)), matcher.group(4));
}
matcher = MAJOR_MINOR_QUALIFIER_VERSION_PATTERN.matcher(rawVersion);
@@ -418,7 +420,7 @@
/*
* return the error code of the http connection
-
+
* @return
*/
public int getStatus() {
