Skip to content

Commit 9f2fbd0

Browse files
committed
Merge branch '6.x' into ccr-6.x
* 6.x: Remove out-of-date projectile file Remove Gradle cheatsheet Fix reproduction info to point to Gradle wrapper Update platforms tests to use Gradle wrapper Update testing docs to reflect Gradle wrapper Update contributing docs to use the Gradle wrapper test: replaced try-catch statements with expectThrows(...) Add getWarmer and getTranslog method to NodeIndicesStats (#28092) fix doc mistake Added ASN support for Ingest GeoIP plugin. Fix global aggregation that requires breadth first and scores (#27942)
2 parents bb1e42d + 7f6786d commit 9f2fbd0

File tree

19 files changed

+401
-188
lines changed

19 files changed

+401
-188
lines changed

.projectile

Lines changed: 0 additions & 31 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,17 @@ Contributing to the Elasticsearch codebase
9595
Elasticsearch uses the Gradle wrapper for its build. You can execute Gradle
9696
using the wrapper via the `gradlew` script in the root of the repository.
9797

98-
Eclipse users can automatically configure their IDE: `gradle eclipse`
98+
We support development in the Eclipse and IntelliJ IDEs. For Eclipse, the
99+
minimum version that we support is [Eclipse Oxygen][eclipse] (version 4.7). For
100+
IntelliJ, the minimum version that we support is [IntelliJ 2017.2][intellij].
101+
102+
Eclipse users can automatically configure their IDE: `./gradlew eclipse`
99103
then `File: Import: Existing Projects into Workspace`. Select the
100104
option `Search for nested projects`. Additionally you will want to
101105
ensure that Eclipse is using 2048m of heap by modifying `eclipse.ini`
102106
accordingly to avoid GC overhead errors.
103107

104-
IntelliJ users can automatically configure their IDE: `gradle idea`
108+
IntelliJ users can automatically configure their IDE: `./gradlew idea`
105109
then `File->New Project From Existing Sources`. Point to the root of
106110
the source directory, select
107111
`Import project from external model->Gradle`, enable
@@ -119,7 +123,7 @@ restart of IDEA). For IDEA 2017.3 and above, in addition to the JVM option, you
119123
classpath](https://github.com/elastic/elasticsearch/issues/14348) if that is
120124
reported as a source of jar hell.
121125

122-
To run an instance of elasticsearch from the source code run `gradle run`
126+
To run an instance of elasticsearch from the source code run `./gradlew run`
123127

124128
The Elasticsearch codebase makes heavy use of Java `assert`s and the
125129
test runner requires that assertions be enabled within the JVM. This
@@ -147,15 +151,15 @@ To create a distribution from the source, simply run:
147151

148152
```sh
149153
cd elasticsearch/
150-
gradle assemble
154+
./gradlew assemble
151155
```
152156

153157
You will find the newly built packages under: `./distribution/(deb|rpm|tar|zip)/build/distributions/`.
154158

155159
Before submitting your changes, run the test suite to make sure that nothing is broken, with:
156160

157161
```sh
158-
gradle check
162+
./gradlew check
159163
```
160164

161165
Contributing as part of a class
@@ -183,6 +187,6 @@ code review process because it wastes our time.
183187
* We don't have the capacity to absorb an entire class full of new contributors,
184188
especially when they are unlikely to become long time contributors.
185189

186-
Finally, we require that you run `gradle check` before submitting a
190+
Finally, we require that you run `./gradlew check` before submitting a
187191
non-documentation contribution. This is mentioned above, but it is worth
188192
repeating in this section because it has come up in this context.

GRADLE.CHEATSHEET

Lines changed: 0 additions & 7 deletions
This file was deleted.

README.textile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,9 @@ We have just covered a very small portion of what Elasticsearch is all about. Fo
202202

203203
h3. Building from Source
204204

205-
Elasticsearch uses "Gradle":https://gradle.org for its build system. You'll need to have at least version 3.3 of Gradle installed.
205+
Elasticsearch uses "Gradle":https://gradle.org for its build system.
206206

207-
In order to create a distribution, simply run the @gradle assemble@ command in the cloned directory.
207+
In order to create a distribution, simply run the @./gradlew assemble@ command in the cloned directory.
208208

209209
The distribution for each project will be created under the @build/distributions@ directory in that project.
210210

0 commit comments

Comments
 (0)