Skip to content

Commit c295dfa

Browse files
committed
Merge branch 'master' into compile-with-jdk-9
* master: 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 (elastic#28088) Update contributing docs to use the Gradle wrapper Create nio-transport plugin for NioTransport (elastic#27949)
2 parents 95475f9 + 86ee552 commit c295dfa

File tree

60 files changed

+1614
-929
lines changed

Some content is hidden

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

60 files changed

+1614
-929
lines changed

CONTRIBUTING.md

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

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

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

134-
To run an instance of elasticsearch from the source code run `gradle run`
134+
To run an instance of elasticsearch from the source code run `./gradlew run`
135135

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

160160
```sh
161161
cd elasticsearch/
162-
gradle assemble
162+
./gradlew assemble
163163
```
164164

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

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

169169
```sh
170-
gradle check
170+
./gradlew check
171171
```
172172

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

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

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)