From 412ad6b800c1fbd15661110e21d836b888231cce Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Wed, 26 Aug 2015 15:23:41 +0000
Subject: [PATCH] OPENDJ-2232 Fix OpenDJ trunk to use Git
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java
index 97c989d..57241a8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java
@@ -145,7 +145,7 @@
MAJOR_VERSION,
MINOR_VERSION,
POINT_VERSION,
- REVISION_NUMBER);
+ REVISION);
}
catch (Throwable t)
{
@@ -174,7 +174,7 @@
MAJOR_VERSION,
MINOR_VERSION,
POINT_VERSION,
- REVISION_NUMBER);
+ REVISION);
return bi;
}
@@ -198,7 +198,7 @@
// Allow negative revision number for cases where there is no
// VCS available.
- Pattern p = Pattern.compile("((\\d+)\\.(\\d+)\\.(\\d+)\\.(-?\\d+))");
+ Pattern p = Pattern.compile("((\\d+)\\.(\\d+)\\.(\\d+)\\.(-?.+))");
Matcher m = p.matcher(bn);
if (!m.matches()) {
throw new IllegalArgumentException("'" + bn + "' is not a build string");
@@ -208,7 +208,7 @@
bi.values.put(MAJOR_VERSION, m.group(2));
bi.values.put(MINOR_VERSION, m.group(3));
bi.values.put(POINT_VERSION, m.group(4));
- bi.values.put(REVISION_NUMBER, m.group(5));
+ bi.values.put(REVISION, m.group(5));
} catch (Exception e) {
throw new IllegalArgumentException("Error parsing build number " + bn);
}
@@ -233,8 +233,7 @@
String.valueOf(DynamicConstants.POINT_VERSION));
bi.values.put(VERSION_QUALIFIER,
String.valueOf(DynamicConstants.VERSION_QUALIFIER));
- bi.values.put(REVISION_NUMBER,
- String.valueOf(DynamicConstants.REVISION_NUMBER));
+ bi.values.put(REVISION, DynamicConstants.REVISION);
bi.values.put(URL_REPOSITORY,
String.valueOf(DynamicConstants.URL_REPOSITORY));
bi.values.put(FIX_IDS, DynamicConstants.FIX_IDS);
@@ -253,7 +252,7 @@
MAJOR_VERSION,
MINOR_VERSION,
POINT_VERSION,
- REVISION_NUMBER);
+ REVISION);
return bi;
}
@@ -306,12 +305,12 @@
}
/**
- * Gets the SVN revision number.
+ * Gets the VCS revision.
*
- * @return Integer representing the SVN revision number
+ * @return String representing the VCS revision
*/
- public Integer getRevisionNumber() {
- return Integer.valueOf(values.get(REVISION_NUMBER));
+ public String getRevision() {
+ return values.get(REVISION);
}
/** {@inheritDoc} */
@@ -336,9 +335,9 @@
if (getMajorVersion().equals(bi.getMajorVersion())) {
if (getMinorVersion().equals(bi.getMinorVersion())) {
if (getPointVersion().equals(bi.getPointVersion())) {
- if (getRevisionNumber().equals(bi.getRevisionNumber())) {
+ if (getRevision().equals(bi.getRevision())) {
return 0;
- } else if (getRevisionNumber() < bi.getRevisionNumber()) {
+ } else if (getRevision().compareTo(bi.getRevision()) < 0) {
return -1;
}
} else if (getPointVersion() < bi.getPointVersion()) {
@@ -371,7 +370,7 @@
hc = 31 * hc + getMajorVersion().hashCode();
hc = 31 * hc + getMinorVersion().hashCode();
hc = 31 * hc + getPointVersion().hashCode();
- hc = 31 * hc + getRevisionNumber().hashCode();
+ hc = 31 * hc + getRevision().hashCode();
return hc;
}
--
Gitblit v1.10.0