Skip to content

Commit 7190de2

Browse files
committed
Merge branch 'master' into update_aws_java_sdk_to_support_ecs_task_roles
* master: (74 commits) Update version of TaskInfo header serialization after backport TEST: Tightens file-based condition in peer-recovery Correct backport replica rollback to 6.2 (elastic#28181) Backport replica rollback to 6.2 (elastic#28181) Rename deleteLocalTranslog to createNewTranslog AwaitsFix #testRecoveryAfterPrimaryPromotion TEST: init unassigned gcp in testAcquireIndexCommit Replica start peer recovery with safe commit (elastic#28181) Truncate tlog cli should assign global checkpoint (elastic#28192) Fix lock accounting in releasable lock Add ability to associate an ID with tasks (elastic#27764) [DOCS] Removed differencies between text and code (elastic#27993) text fixes (elastic#28136) Update getting-started.asciidoc (elastic#28145) [Docs] Spelling fix in painless-getting-started.asciidoc (elastic#28187) Fixed the cat.health REST test to accept 4ms, not just 4.0ms (elastic#28186) Do not keep 5.x commits once having 6.x commits (elastic#28188) Rename core module to server (elastic#28180) upgraded jna from 4.4.0-1 to 4.5.1 (elastic#28183) [TEST] Do not call RandomizedTest.scaledRandomIntBetween from multiple threads ...
2 parents 008edf6 + aec0c0f commit 7190de2

File tree

4,779 files changed

+6690
-3196
lines changed

Some content is hidden

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

4,779 files changed

+6690
-3196
lines changed

.gitignore

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ nbactions.xml
2020
.gradle/
2121
build/
2222

23-
# gradle wrapper
24-
/gradle/
25-
gradlew
26-
gradlew.bat
27-
2823
# maven stuff (to be removed when trunk becomes 4.x)
2924
*-execution-hints.log
3025
target/

.projectile

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

CONTRIBUTING.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,21 +92,20 @@ Contributing to the Elasticsearch codebase
9292

9393
**Repository:** [https://github.com/elastic/elasticsearch](https://github.com/elastic/elasticsearch)
9494

95-
Make sure you have [Gradle](http://gradle.org) installed, as
96-
Elasticsearch uses it as its build system. Gradle must be at least
97-
version 4.3 in order to build successfully.
95+
Elasticsearch uses the Gradle wrapper for its build. You can execute Gradle
96+
using the wrapper via the `gradlew` script in the root of the repository.
9897

9998
We support development in the Eclipse and IntelliJ IDEs. For Eclipse, the
10099
minimum version that we support is [Eclipse Oxygen][eclipse] (version 4.7). For
101100
IntelliJ, the minimum version that we support is [IntelliJ 2017.2][intellij].
102101

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

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

127-
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`
128127

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

153152
```sh
154153
cd elasticsearch/
155-
gradle assemble
154+
./gradlew assemble
156155
```
157156

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

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

162161
```sh
163-
gradle check
162+
./gradlew check
164163
```
165164

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

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

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)