Remove incorrect bwc branch logic from master

Commit elastic/x-pack-elasticsearch@b07aa78a7b was a forward port of logic needed in 5.x to get
the correct bwc branch. However, other changes on master meant that this forward port was not
needed and actually broke the bwc tests. This change removes the incorrect if statement and project name.

Original commit: elastic/x-pack-elasticsearch@9a77269fa6
This commit is contained in:
jaymode 2017-06-09 09:44:26 -06:00
parent 709ed7d50e
commit 741bf85fbf

View File

@ -35,9 +35,7 @@ subprojects {
def (String major, String minor, String bugfix) = bwcVersion.split('\\.')
def (String currentMajor, String currentMinor, String currentBugfix) = version.split('\\.')
String bwcBranch
if (project.name == 'bwc-stable-snapshot') {
bwcBranch = "${major}.x"
} else if (major != currentMajor) {
if (project.name == 'stable-snapshot') {
bwcBranch = "${major}.x"
} else {
bwcBranch = "${major}.${minor}"