Revert "Revert "Build: Upgrade min gradle to 3.3 (#23544)""

This reverts commit f926a717ed.
This commit is contained in:
Boaz Leskes 2017-03-21 11:20:04 +01:00
parent f926a717ed
commit 38a18db81e
4 changed files with 6 additions and 6 deletions

View File

@ -88,8 +88,8 @@ Contributing to the Elasticsearch codebase
**Repository:** [https://github.com/elastic/elasticsearch](https://github.com/elastic/elasticsearch) **Repository:** [https://github.com/elastic/elasticsearch](https://github.com/elastic/elasticsearch)
Make sure you have [Gradle](http://gradle.org) installed, as 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 Elasticsearch uses it as its build system. Gradle must be at least
order to build successfully. version 3.3 in order to build successfully.
Eclipse users can automatically configure their IDE: `gradle eclipse` Eclipse users can automatically configure their IDE: `gradle eclipse`
then `File: Import: Existing Projects into Workspace`. Select the then `File: Import: Existing Projects into Workspace`. Select the

View File

@ -200,7 +200,7 @@ We have just covered a very small portion of what Elasticsearch is all about. Fo
h3. Building from Source 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. In order to create a distribution, simply run the @gradle assemble@ command in the cloned directory.

View File

@ -23,8 +23,8 @@ apply plugin: 'groovy'
group = 'org.elasticsearch.gradle' group = 'org.elasticsearch.gradle'
if (GradleVersion.current() < GradleVersion.version('2.13')) { if (GradleVersion.current() < GradleVersion.version('3.3')) {
throw new GradleException('Gradle 2.13+ is required to build elasticsearch') throw new GradleException('Gradle 3.3+ is required to build elasticsearch')
} }
if (JavaVersion.current() < JavaVersion.VERSION_1_8) { if (JavaVersion.current() < JavaVersion.VERSION_1_8) {

View File

@ -122,7 +122,7 @@ class BuildPlugin implements Plugin<Project> {
} }
// enforce gradle version // enforce gradle version
GradleVersion minGradle = GradleVersion.version('2.13') GradleVersion minGradle = GradleVersion.version('3.3')
if (GradleVersion.current() < minGradle) { if (GradleVersion.current() < minGradle) {
throw new GradleException("${minGradle} or above is required to build elasticsearch") throw new GradleException("${minGradle} or above is required to build elasticsearch")
} }