You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2012/12/12 08:19:54 UTC
svn commit: r1420547 - in /zookeeper/trunk: CHANGES.txt
src/java/main/org/apache/zookeeper/version/util/VerGen.java
src/java/test/org/apache/zookeeper/VerGenTest.java
Author: phunt
Date: Wed Dec 12 07:19:53 2012
New Revision: 1420547
URL: http://svn.apache.org/viewvc?rev=1420547&view=rev
Log:
ZOOKEEPER-1598. Ability to support more digits in the version string (Raja Aluri via phunt)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/main/org/apache/zookeeper/version/util/VerGen.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/VerGenTest.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1420547&r1=1420546&r2=1420547&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Wed Dec 12 07:19:53 2012
@@ -416,6 +416,9 @@ IMPROVEMENTS:
ZOOKEEPER-1564. Allow JUnit test build with IBM Java
(Paulo Ricardo Paz Vital via phunt)
+ ZOOKEEPER-1598. Ability to support more digits in the version string
+ (Raja Aluri via phunt)
+
Release 3.4.0 -
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/version/util/VerGen.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/version/util/VerGen.java?rev=1420547&r1=1420546&r2=1420547&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/version/util/VerGen.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/version/util/VerGen.java Wed Dec 12 07:19:53 2012
@@ -112,11 +112,11 @@ public class VerGen {
public int micro;
public String qualifier;
}
-
+
public static Version parseVersionString(String input) {
Version result = new Version();
- Pattern p = Pattern.compile("^(\\d+).(\\d+).(\\d+)(-(.+))?$");
+ Pattern p = Pattern.compile("^(\\d+)\\.(\\d+)\\.(\\d+)((\\.\\d+)*)(-(.+))?$");
Matcher m = p.matcher(input);
if (!m.matches()) {
@@ -125,8 +125,8 @@ public class VerGen {
result.maj = Integer.parseInt(m.group(1));
result.min = Integer.parseInt(m.group(2));
result.micro = Integer.parseInt(m.group(3));
- if (m.groupCount() == 5) {
- result.qualifier = m.group(5);
+ if (m.groupCount() == 7) {
+ result.qualifier = m.group(7);
} else {
result.qualifier = null;
}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/VerGenTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/VerGenTest.java?rev=1420547&r1=1420546&r2=1420547&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/VerGenTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/VerGenTest.java Wed Dec 12 07:19:53 2012
@@ -43,7 +43,10 @@ public class VerGenTest extends ZKTestCa
{"1.2.3", new Object[] {1, 2, 3, null}},
{"1.2.3-dev", new Object[] {1, 2, 3, "dev"}},
{"1.2.3-SNAPSHOT", new Object[] {1, 2, 3, "SNAPSHOT"}},
- {"1.2.3-foo-bar+123", new Object[] {1, 2, 3, "foo-bar+123"}}
+ {"1.2.3-SNAPSHOT", new Object[] {1, 2, 3, "SNAPSHOT"}},
+ {"1.2.3-foo-bar+123", new Object[] {1, 2, 3, "foo-bar+123"}},
+ {"1.2.3.4.5-SNAPSHOT", new Object[] {1, 2, 3, "SNAPSHOT"}},
+ {"1.2.3.4.5-foo-bar+123", new Object[] {1, 2, 3, "foo-bar+123"}}
});
}