Merge branch 'SPR-10124' into cleanup-3.2.x

* SPR-10124:
  Use unmodified 'version' when not on a topic branch
This commit is contained in:
Chris Beams 2013-01-03 23:56:31 +01:00
commit 1487b70394
1 changed files with 2 additions and 1 deletions

View File

@ -967,7 +967,8 @@ def qualifyVersionIfNecessary(version) {
if (rootProject.hasProperty("BRANCH_NAME")) {
def qualifier = rootProject.getProperty("BRANCH_NAME")
if (qualifier.startsWith("SPR-")) {
version = version.replace('BUILD', qualifier)
return version.replace('BUILD', qualifier)
}
}
return version
}