From 919331aa216b53da48bcfd4998f06bb8b8e46e11 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Sat, 11 Mar 2017 10:03:45 -0800 Subject: [PATCH 1/2] Build: Upgrade min gradle to 3.3 This will allow us to get rid of deprecation warnings that appear when using 3.3, and also get rid of extra logic for 2.13 required because of the progress logger. --- buildSrc/build.gradle | 4 ++-- .../main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index fcb504b83cec7..79575897ca65a 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -23,8 +23,8 @@ apply plugin: 'groovy' group = 'org.elasticsearch.gradle' -if (GradleVersion.current() < GradleVersion.version('2.13')) { - throw new GradleException('Gradle 2.13+ is required to build elasticsearch') +if (GradleVersion.current() < GradleVersion.version('3.3')) { + throw new GradleException('Gradle 3.3+ is required to build elasticsearch') } if (JavaVersion.current() < JavaVersion.VERSION_1_8) { diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy index 5e58bcc78787e..8eb9855620b0f 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy @@ -121,7 +121,7 @@ class BuildPlugin implements Plugin { } // enforce gradle version - GradleVersion minGradle = GradleVersion.version('2.13') + GradleVersion minGradle = GradleVersion.version('3.3') if (GradleVersion.current() < minGradle) { throw new GradleException("${minGradle} or above is required to build elasticsearch") } From d8dc5c6999a82af8f7b9132aed70ef14312cc274 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Mon, 20 Mar 2017 15:27:02 -0700 Subject: [PATCH 2/2] update docs --- CONTRIBUTING.md | 4 ++-- README.textile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 65ec599b551d0..8775e1464d068 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -88,8 +88,8 @@ Contributing to the Elasticsearch codebase **Repository:** [https://github.com/elastic/elasticsearch](https://github.com/elastic/elasticsearch) Make sure you have [Gradle](http://gradle.org) installed, as -Elasticsearch uses it as its build system. Gradle must be version 2.13 _exactly_ in -order to build successfully. +Elasticsearch uses it as its build system. Gradle must be at least +version 3.3 in order to build successfully. Eclipse users can automatically configure their IDE: `gradle eclipse` then `File: Import: Existing Projects into Workspace`. Select the diff --git a/README.textile b/README.textile index 5bc5b7f25053a..9c2b2c5d91e2c 100644 --- a/README.textile +++ b/README.textile @@ -200,7 +200,7 @@ We have just covered a very small portion of what Elasticsearch is all about. Fo h3. Building from Source -Elasticsearch uses "Gradle":https://gradle.org for its build system. You'll need to have version 2.13 of Gradle installed. +Elasticsearch uses "Gradle":https://gradle.org for its build system. You'll need to have at least version 3.3 of Gradle installed. In order to create a distribution, simply run the @gradle assemble@ command in the cloned directory.