Skip to content

Commit a86a21d

Browse files
committed
Merge branch 'master' into ccr
* master: 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 Painless: Modify Loader to Load Classes Directly from Definition (#28088) Update contributing docs to use the Gradle wrapper Create nio-transport plugin for NioTransport (#27949) 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 5ca71f8 + 8b0b0c3 commit a86a21d

File tree

72 files changed

+1940
-1024
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1940
-1024
lines changed

.projectile

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

CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ We support development in the Eclipse and IntelliJ IDEs. For Eclipse, the
9999
minimum version that we support is [Eclipse Oxygen][eclipse] (version 4.7). For
100100
IntelliJ, the minimum version that we support is [IntelliJ 2017.2][intellij].
101101

102-
Eclipse users can automatically configure their IDE: `gradle eclipse`
102+
Eclipse users can automatically configure their IDE: `./gradlew eclipse`
103103
then `File: Import: Existing Projects into Workspace`. Select the
104104
option `Search for nested projects`. Additionally you will want to
105105
ensure that Eclipse is using 2048m of heap by modifying `eclipse.ini`
106106
accordingly to avoid GC overhead errors.
107107

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

126-
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`
127127

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

152152
```sh
153153
cd elasticsearch/
154-
gradle assemble
154+
./gradlew assemble
155155
```
156156

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

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

161161
```sh
162-
gradle check
162+
./gradlew check
163163
```
164164

165165
Contributing as part of a class
@@ -187,7 +187,7 @@ code review process because it wastes our time.
187187
* We don't have the capacity to absorb an entire class full of new contributors,
188188
especially when they are unlikely to become long time contributors.
189189

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

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)