From a011cdd279e59c00c60211867b848089c02cf01c Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 05 May 2015 11:20:22 +0000
Subject: [PATCH] Add qualifier to product and snmp versions
---
opendj-server-legacy/pom.xml | 2 +-
opendj-server-legacy/src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java | 8 +++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index 9928f3f..e8a7e5f 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -1485,7 +1485,7 @@
<addMavenDescriptor>false</addMavenDescriptor>
<manifestEntries>
<Extension-Name>snmp-mib2605</Extension-Name>
- <Implementation-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Implementation-Version>
+ <Implementation-Version>${project.version}</Implementation-Version>
<Revision-Number>${buildRevision}</Revision-Number>
</manifestEntries>
</archive>
diff --git a/opendj-server-legacy/src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java b/opendj-server-legacy/src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java
index c810784..b933823 100644
--- a/opendj-server-legacy/src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java
+++ b/opendj-server-legacy/src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java
@@ -310,11 +310,9 @@
/**
* A full version string for this product.
*/
- public static String FULL_VERSION_STRING =
- PRODUCT_NAME + " " + RELEASE_VERSION_STRING +
- (((FIX_IDS != null) && (FIX_IDS.length() > 0))
- ? "+" + FIX_IDS
- : "");
+ public static String FULL_VERSION_STRING = PRODUCT_NAME + " " + RELEASE_VERSION_STRING
+ + (VERSION_QUALIFIER != null && !VERSION_QUALIFIER.isEmpty() ? "-" + VERSION_QUALIFIER : "")
+ + (FIX_IDS != null && !FIX_IDS.isEmpty() ? "+" + FIX_IDS : "");
/**
* A printable version string for this product.
--
Gitblit v1.10.0