From 68d9b56fcb47d9c813b3f65d7253ee9f3e5fc661 Mon Sep 17 00:00:00 2001 From: Armin Braun Date: Thu, 15 Nov 2018 14:24:04 +0100 Subject: [PATCH] MINOR: Remove SNAPSHOT Suffixes in Gradle (#35577) * MINOR: Remove SNAPSHOT Suffixes in Gradle * The snapshot qualifiers here are redundant and 6.5.0 is released anyway --- .../org/elasticsearch/gradle/test/ClusterConfiguration.groovy | 2 +- .../org/elasticsearch/gradle/test/ClusterFormationTasks.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterConfiguration.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterConfiguration.groovy index fa3db32e6a0..399c4838d2b 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterConfiguration.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterConfiguration.groovy @@ -69,7 +69,7 @@ class ClusterConfiguration { */ @Input Closure minimumMasterNodes = { - if (bwcVersion != null && bwcVersion.before("6.5.0-SNAPSHOT")) { + if (bwcVersion != null && bwcVersion.before("6.5.0")) { return numNodes > 1 ? numNodes : -1 } else { return numNodes > 1 ? numNodes.intdiv(2) + 1 : -1 diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy index 2b9e2c54569..28c212235f3 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy @@ -127,7 +127,7 @@ class ClusterFormationTasks { nodes.add(node) Closure writeConfigSetup Object dependsOn - if (node.nodeVersion.onOrAfter("6.5.0-SNAPSHOT")) { + if (node.nodeVersion.onOrAfter("6.5.0")) { writeConfigSetup = { Map esConfig -> // Don't force discovery provider if one is set by the test cluster specs already if (esConfig.containsKey('discovery.zen.hosts_provider') == false) {