changeset 11047:f32d1b47193f

Merge
author kcr
date Wed, 29 Aug 2018 05:20:33 -0700
parents 12c560434da0 9b5708c95686
children e1d1bb48b99a
files .hgtags build.gradle
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Aug 28 14:24:11 2018 -0700
+++ b/.hgtags	Wed Aug 29 05:20:33 2018 -0700
@@ -509,3 +509,4 @@
 812efc1ce8017dcc0c5e150ad91a7e99f25a2d80 12+0
 15770e65250e465e67848f2d1b8016b134e3046c 11+23
 bf4a59920c38bb12404d504b0ced6bede615df4a 11+24
+5815764071f022f4595e3fb69ae7f79c6edd4fc1 11+25
--- a/build.gradle	Tue Aug 28 14:24:11 2018 -0700
+++ b/build.gradle	Wed Aug 29 05:20:33 2018 -0700
@@ -537,7 +537,7 @@
 defineProperty("RELEASE_SUFFIX", relSuffix)
 defineProperty("RELEASE_VERSION_SHORT", "${RELEASE_VERSION}${RELEASE_SUFFIX}")
 defineProperty("RELEASE_VERSION_LONG", "${RELEASE_VERSION_SHORT}+${PROMOTED_BUILD_NUMBER}${relOpt}")
-defineProperty("MAVEN_VERSION", "$RELEASE_VERSION_LONG")
+defineProperty("MAVEN_VERSION", IS_MILESTONE_FCS ? "${RELEASE_VERSION_SHORT}" : "${RELEASE_VERSION_LONG}")
 
 // Check whether the COMPILE_TARGETS property has been specified (if so, it was done by
 // the user and not by this script). If it has not been defined then default