mirror of
https://github.com/spring-projects/spring-framework.git
synced 2026-09-26 08:59:09 +00:00
Merge branch '3.2.x' into master
* 3.2.x: Use unmodified 'version' when not on a topic branch
This commit is contained in:
+2
-1
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user