Skip to content

Commit 8507e30

Browse files
weizijunweizijun
committed
Merge branch 'upstream/master' into update-filter-improve
* upstream/master: (319 commits) Fix typo (elastic#80925) Increase docker compose timeouts for CI builds TSDB: fix error without feature flag (elastic#80945) [DOCS] Relocate `index.mapping.dimension_fields.limit` setting docs (elastic#80964) Explicit write methods for always-missing values (elastic#80958) TSDB: move TimeSeriesModeIT to yaml tests (elastic#80933) [ML] Removing temporary debug (elastic#80956) Remove unused ConnectTransportException#node (elastic#80944) Reinterpret dots in field names as object structure (elastic#79922) Remove obsolete typed legacy index templates (elastic#80937) Remove unnecessary shuffle in unassigned shards allocation. (elastic#65172) TSDB: Tests for nanosecond timeprecision timestamp just beyond the limit (elastic#80932) Cleanup SLM History Item .equals (elastic#80938) Rework breaking changes for new structure (elastic#80907) [DOCS] Fix elasticsearch-reset-password typo (elastic#80919) [ML] No need to use parent task client when internal infer delegates (elastic#80905) Fix shadowed vars pt6 (elastic#80899) add ignore info (elastic#80924) Fix several potential circuit breaker leaks in Aggregators (elastic#79676) Extract more standard metadata from binary files (elastic#78754) ...
2 parents a7cd169 + dd2424b commit 8507e30

File tree

1,935 files changed

+37746
-20977
lines changed

Some content is hidden

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

1,935 files changed

+37746
-20977
lines changed

‎.ci/bwcVersions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ BWC_VERSION:
4444
- "7.15.0"
4545
- "7.15.1"
4646
- "7.15.2"
47+
- "7.15.3"
4748
- "7.16.0"
4849
- "8.0.0"
4950
- "8.1.0"

‎.ci/jobs.t/defaults.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
url: https://github.com/elastic/elasticsearch/
5454
- inject:
5555
properties-content: |
56+
COMPOSE_HTTP_TIMEOUT=120
5657
JOB_BRANCH=%BRANCH%
5758
HOME=$JENKINS_HOME
5859
GRADLEW=./gradlew --parallel --scan --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/

‎.ci/jobs.t/elastic+elasticsearch+multijob+packaging-tests-unix.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
values:
1616
- centos-7-packaging
1717
- centos-8-packaging
18-
- debian-9-packaging
1918
- debian-10-packaging
2019
- debian-11-packaging
2120
- opensuse-15-1-packaging
@@ -26,6 +25,9 @@
2625
- ubuntu-18.04-packaging
2726
- ubuntu-20.04-packaging
2827
- rocky-linux-8-packaging
28+
- rhel-7-packaging
29+
- rhel-8-packaging
30+
- almalinux-8-packaging
2931
builders:
3032
- inject:
3133
properties-file: '.ci/java-versions.properties'

‎.ci/jobs.t/elastic+elasticsearch+multijob+packaging-tests-upgrade.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
properties-content: |
2626
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
2727
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
28-
JAVA15_HOME=$HOME/.java/openjdk15
28+
JAVA16_HOME=$HOME/.java/openjdk16
2929
- shell: |
3030
#!/usr/local/bin/runbld --redirect-stderr
3131
./.ci/os.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ destructiveDistroUpgradeTest.v$BWC_VERSION

‎.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-arm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
2525
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
2626
JAVA11_HOME=$HOME/.java/jdk11
27-
JAVA15_HOME=$HOME/.java/jdk15
27+
JAVA16_HOME=$HOME/.java/jdk16
2828
- shell: |
2929
#!/usr/local/bin/runbld --redirect-stderr
3030
$WORKSPACE/.ci/scripts/run-gradle.sh -Dbwc.checkout.align=true check

‎.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-darwin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
1212
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
1313
JAVA11_HOME=$HOME/.java/java11
14-
JAVA15_HOME=$HOME/.java/openjdk15
14+
JAVA16_HOME=$HOME/.java/openjdk16
1515
- shell: |
1616
#!/usr/local/bin/runbld --redirect-stderr
1717
$WORKSPACE/.ci/scripts/run-gradle.sh -Dbwc.checkout.align=true check

‎.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-unix.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
values:
1616
- "centos-7&&immutable"
1717
- "centos-8&&immutable"
18-
- "debian-9&&immutable"
18+
- "amazon&&immutable"
1919
- "debian-10&&immutable"
2020
- "debian-11&&immutable"
2121
- "opensuse-15-1&&immutable"
@@ -26,14 +26,17 @@
2626
- "ubuntu-18.04&&immutable"
2727
- "ubuntu-20.04&&immutable"
2828
- "rocky-linux-8&&immutable"
29+
- "rhel-7&&immutable"
30+
- "rhel-8&&immutable"
31+
- "almalinux-8&&immutable"
2932
builders:
3033
- inject:
3134
properties-file: '.ci/java-versions.properties'
3235
properties-content: |
3336
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
3437
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
3538
JAVA11_HOME=$HOME/.java/java11
36-
JAVA15_HOME=$HOME/.java/openjdk15
39+
JAVA16_HOME=$HOME/.java/openjdk16
3740
- shell: |
3841
#!/usr/local/bin/runbld --redirect-stderr
3942
$WORKSPACE/.ci/scripts/run-gradle.sh -Dbwc.checkout.align=true check

‎.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
JAVA_HOME=$USERPROFILE\\.java\\$ES_BUILD_JAVA
3636
RUNTIME_JAVA_HOME=$USERPROFILE\\.java\\$ES_RUNTIME_JAVA
3737
JAVA11_HOME=$USERPROFILE\\.java\\java11
38-
JAVA15_HOME=$USERPROFILE\\.java\\openjdk15
38+
JAVA16_HOME=$USERPROFILE\\.java\\openjdk16
3939
- batch: |
4040
del /f /s /q %USERPROFILE%\.gradle\init.d\*.*
4141
mkdir %USERPROFILE%\.gradle\init.d

‎.ci/jobs.t/elastic+elasticsearch+periodic+ear.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
1313
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
1414
JAVA11_HOME=$HOME/.java/java11
15-
JAVA15_HOME=$HOME/.java/openjdk15
15+
JAVA16_HOME=$HOME/.java/openjdk16
1616
- shell: |
1717
#!/bin/bash
1818
# Configure a dm-crypt volume backed by a file

‎.ci/jobs.t/elastic+elasticsearch+periodic+release-tests.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
- job:
33
name: elastic+elasticsearch+%BRANCH%+periodic+release-tests
4-
workspace: /dev/shm/elastic+elasticsearch+%BRANCH%+periodic+release-tests
4+
# Don't use ramdisk since this build generates lots of large artifacts and results in oomkiller issues
5+
# workspace: /dev/shm/elastic+elasticsearch+%BRANCH%+periodic+release-tests
56
display-name: "elastic / elasticsearch # %BRANCH% - release tests"
67
description: "Release version tests for the Elasticsearch %BRANCH% branch.\n"
78
node: "general-purpose && docker"
@@ -12,7 +13,7 @@
1213
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
1314
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
1415
JAVA11_HOME=$HOME/.java/java11
15-
JAVA15_HOME=$HOME/.java/openjdk15
16+
JAVA16_HOME=$HOME/.java/openjdk16
1617
- shell: |
1718
#!/usr/local/bin/runbld --redirect-stderr
1819

‎.ci/jobs.t/elastic+elasticsearch+pull-request+bwc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
3232
JAVA8_HOME=$HOME/.java/java8
3333
JAVA11_HOME=$HOME/.java/java11
34-
JAVA15_HOME=$HOME/.java/openjdk15
34+
JAVA16_HOME=$HOME/.java/openjdk16
3535
- shell: |
3636
#!/usr/local/bin/runbld --redirect-stderr
3737
$WORKSPACE/.ci/scripts/run-gradle.sh -Dignore.tests.seed bwcTestSnapshots

‎.ci/jobs.t/elastic+elasticsearch+pull-request+cloud-deploy.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
---
2+
- job:
3+
name: "elastic+elasticsearch+pull-request+cloud-deploy"
4+
display-name: "elastic / elasticsearch - pull request cloud-deploy"
5+
description: "Testing of Elasticsearch pull requests - cloud-deploy"
6+
workspace: "/dev/shm/elastic+elasticsearch+pull-request+cloud-deploy"
7+
node: "general-purpose && docker"
8+
scm:
9+
- git:
10+
refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
11+
branches:
12+
- "${ghprbActualCommit}"
13+
triggers:
14+
- github-pull-request:
15+
org-list:
16+
- elastic
17+
allow-whitelist-orgs-as-admins: true
18+
trigger-phrase: '.*run\W+elasticsearch-ci/cloud-deploy.*'
19+
github-hooks: true
20+
status-context: elasticsearch-ci/cloud-deploy
21+
cancel-builds-on-update: true
22+
black-list-target-branches:
23+
- 6.8
24+
excluded-regions:
25+
- ^docs/.*
26+
white-list-labels:
27+
- 'cloud-deploy'
28+
builders:
29+
- inject:
30+
properties-file: '.ci/java-versions.properties'
31+
properties-content: |
32+
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
33+
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
34+
- shell: |
35+
#!/usr/local/bin/runbld --redirect-stderr
36+
$WORKSPACE/.ci/scripts/run-gradle.sh buildCloudDockerImage
37+
- shell: |
38+
#!/bin/bash
39+
set +x
40+
VAULT_TOKEN=$(vault write -field=token auth/approle/login role_id=$VAULT_ROLE_ID secret_id=$VAULT_SECRET_ID)
41+
export VAULT_TOKEN
42+
export DOCKER_REGISTRY_USERNAME="$(vault read -field=username secret/elasticsearch-ci/prod_docker_registry_credentials)"
43+
export DOCKER_REGISTRY_PASSWORD="$(vault read -field=password secret/elasticsearch-ci/prod_docker_registry_credentials)"
44+
export ES_VERSION=$(grep 'elasticsearch' build-tools-internal/version.properties | awk '{print $3}')
45+
export DOCKER_TAG=docker.elastic.co/elasticsearch-ci/elasticsearch-cloud:${ES_VERSION}-${ghprbActualCommit:0:7}
46+
docker tag elasticsearch-cloud:test $DOCKER_TAG
47+
echo $DOCKER_REGISTRY_PASSWORD | docker login -u $DOCKER_REGISTRY_USERNAME --password-stdin docker.elastic.co
48+
unset VAULT_TOKEN DOCKER_REGISTRY_USERNAME DOCKER_REGISTRY_PASSWORD
49+
set -x
50+
docker push $DOCKER_TAG

‎.ci/jobs.t/elastic+elasticsearch+pull-request+example-plugins.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
- job:
3+
name: "elastic+elasticsearch+pull-request+example-plugins"
4+
display-name: "elastic / elasticsearch - pull request example-plugins"
5+
description: "Testing of Elasticsearch pull requests - example-plugins"
6+
workspace: "/dev/shm/elastic+elasticsearch+pull-request+example-plugins"
7+
scm:
8+
- git:
9+
refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
10+
branches:
11+
- "${ghprbActualCommit}"
12+
triggers:
13+
- github-pull-request:
14+
org-list:
15+
- elastic
16+
allow-whitelist-orgs-as-admins: true
17+
trigger-phrase: '.*run\W+elasticsearch-ci/example-plugins.*'
18+
github-hooks: true
19+
status-context: elasticsearch-ci/example-plugins
20+
cancel-builds-on-update: true
21+
white-list-labels:
22+
- ':Delivery/Build'
23+
builders:
24+
- inject:
25+
properties-file: '.ci/java-versions.properties'
26+
properties-content: |
27+
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
28+
JAVA8_HOME=$HOME/.java/java8
29+
JAVA11_HOME=$HOME/.java/java11
30+
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
31+
- shell: |
32+
#!/usr/local/bin/runbld --redirect-stderr
33+
cd plugins/examples
34+
$WORKSPACE/.ci/scripts/run-gradle.sh -Dorg.gradle.jvmargs=-Xmx8g build --include-build $WORKSPACE

‎.ci/jobs.t/elastic+elasticsearch+pull-request+full-bwc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
4545
JAVA8_HOME=$HOME/.java/java8
4646
JAVA11_HOME=$HOME/.java/java11
47-
JAVA15_HOME=$HOME/.java/openjdk15
47+
JAVA16_HOME=$HOME/.java/openjdk16
4848
- shell: |
4949
#!/usr/local/bin/runbld --redirect-stderr
5050
$WORKSPACE/.ci/scripts/run-gradle.sh -Dignore.tests.seed v$BWC_VERSION#bwcTest

‎.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-upgrade-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
4848
JAVA8_HOME=$HOME/.java/java8
4949
JAVA11_HOME=$HOME/.java/java11
50-
JAVA15_HOME=$HOME/.java/openjdk15
50+
JAVA16_HOME=$HOME/.java/openjdk16
5151
- shell: |
5252
#!/usr/local/bin/runbld --redirect-stderr
5353
./.ci/os.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ destructiveDistroUpgradeTest.v$BWC_VERSION

‎.ci/jobs.t/elastic+elasticsearch+pull-request+part-1-fips.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
properties-content: |
3434
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
3535
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
36-
JAVA15_HOME=$HOME/.java/openjdk15
36+
JAVA16_HOME=$HOME/.java/openjdk16
3737
- shell: |
3838
#!/usr/local/bin/runbld --redirect-stderr
3939
$WORKSPACE/.ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.fips.enabled=true checkPart1

‎.ci/jobs.t/elastic+elasticsearch+pull-request+part-1-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
properties-content: |
3434
JAVA_HOME=$USERPROFILE\\.java\\$ES_BUILD_JAVA
3535
RUNTIME_JAVA_HOME=$USERPROFILE\\.java\\$ES_RUNTIME_JAVA
36-
JAVA15_HOME=$USERPROFILE\\.java\\openjdk15
36+
JAVA16_HOME=$USERPROFILE\\.java\\openjdk16
3737
GRADLE_TASK=checkPart1
3838
- batch: |
3939
del /f /s /q %USERPROFILE%\.gradle\init.d\*.*

‎.ci/jobs.t/elastic+elasticsearch+pull-request+part-2-fips.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
properties-content: |
3434
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
3535
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
36-
JAVA15_HOME=$HOME/.java/openjdk15
36+
JAVA16_HOME=$HOME/.java/openjdk16
3737
- shell: |
3838
#!/usr/local/bin/runbld --redirect-stderr
3939
$WORKSPACE/.ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.fips.enabled=true checkPart2

‎.ci/jobs.t/elastic+elasticsearch+pull-request+part-2-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
properties-content: |
3434
JAVA_HOME=$USERPROFILE\\.java\\$ES_BUILD_JAVA
3535
RUNTIME_JAVA_HOME=$USERPROFILE\\.java\\$ES_RUNTIME_JAVA
36-
JAVA15_HOME=$USERPROFILE\\.java\\openjdk15
36+
JAVA16_HOME=$USERPROFILE\\.java\\openjdk16
3737
GRADLE_TASK=checkPart2
3838
- batch: |
3939
del /f /s /q %USERPROFILE%\.gradle\init.d\*.*

‎.ci/jobs.t/elastic+elasticsearch+pull-request+release-tests.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
name: "elastic+elasticsearch+pull-request+release-tests"
44
display-name: "elastic / elasticsearch - pull request release-tests"
55
description: "Testing of Elasticsearch pull requests - release-tests"
6-
workspace: "/dev/shm/elastic+elasticsearch+pull-request+release-tests"
6+
# Don't use ramdisk since this build generates lots of large artifacts and results in oomkiller issues
7+
# workspace: "/dev/shm/elastic+elasticsearch+pull-request+release-tests"
8+
node: "general-purpose && docker"
79
scm:
810
- git:
911
refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
@@ -33,7 +35,7 @@
3335
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
3436
JAVA8_HOME=$HOME/.java/java8
3537
JAVA11_HOME=$HOME/.java/java11
36-
JAVA15_HOME=$HOME/.java/openjdk15
38+
JAVA16_HOME=$HOME/.java/openjdk16
3739
- shell: |
3840
#!/usr/local/bin/runbld --redirect-stderr
3941

‎.ci/jobs.t/elastic+elasticsearch+pull-request+rest-compatibility.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
3535
JAVA8_HOME=$HOME/.java/java8
3636
JAVA11_HOME=$HOME/.java/java11
37-
JAVA15_HOME=$HOME/.java/openjdk15
37+
JAVA16_HOME=$HOME/.java/openjdk16
3838
- shell: |
3939
#!/usr/local/bin/runbld --redirect-stderr
4040
$WORKSPACE/.ci/scripts/run-gradle.sh -Dignore.tests.seed checkRestCompat

‎.ci/packer_cache.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ if [ "$(uname -m)" = "arm64" ] || [ "$(uname -m)" = "aarch64" ]; then
1919
## On ARM we use a different properties file for setting java home
2020
## Also, we don't bother attempting to resolve dependencies for the 6.8 branch
2121
source $(dirname "${SCRIPT}")/java-versions-aarch64.properties
22-
export JAVA15_HOME="${HOME}"/.java/jdk15
22+
export JAVA16_HOME="${HOME}"/.java/jdk16
2323
else
2424
source $(dirname "${SCRIPT}")/java-versions.properties
2525
## We are caching BWC versions too, need these so we can build those
@@ -29,6 +29,7 @@ else
2929
export JAVA13_HOME="${HOME}"/.java/openjdk13
3030
export JAVA14_HOME="${HOME}"/.java/openjdk14
3131
export JAVA15_HOME="${HOME}"/.java/openjdk15
32+
export JAVA16_HOME="${HOME}"/.java/openjdk16
3233

3334
## 6.8 branch is not referenced from any bwc project in master so we need to
3435
## resolve its dependencies explicitly

‎.ci/templates.t/generic-gradle-unix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
1212
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
1313
JAVA11_HOME=$HOME/.java/java11
14-
JAVA15_HOME=$HOME/.java/openjdk15
14+
JAVA16_HOME=$HOME/.java/openjdk16
1515
- shell: |
1616
#!/usr/local/bin/runbld --redirect-stderr
1717
$WORKSPACE/.ci/scripts/run-gradle.sh {gradle-args}

‎.ci/templates.t/matrix-gradle-unix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
2727
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
2828
JAVA11_HOME=$HOME/.java/java11
29-
JAVA15_HOME=$HOME/.java/openjdk15
29+
JAVA16_HOME=$HOME/.java/openjdk16
3030
- shell: |
3131
#!/usr/local/bin/runbld --redirect-stderr
3232
$WORKSPACE/.ci/scripts/run-gradle.sh {gradle-args}

‎.ci/templates.t/pull-request-gradle-unix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
3131
JAVA8_HOME=$HOME/.java/java8
3232
JAVA11_HOME=$HOME/.java/java11
33-
JAVA15_HOME=$HOME/.java/openjdk15
33+
JAVA16_HOME=$HOME/.java/openjdk16
3434
- shell: |
3535
#!/usr/local/bin/runbld --redirect-stderr
3636
$WORKSPACE/.ci/scripts/run-gradle.sh {gradle-args}

‎.git-blame-ignore-revs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Use this file by running:
55
#
6-
# git blame --ignore-revs-file=.git-blame-ignore-rev <file>
6+
# git blame --ignore-revs-file=.git-blame-ignore-revs <file>
77
#
88
# or by configuring `blame.ignoreRevsFile`. The latter ought to also work
99
# with IDEs such as IntelliJ.

‎CONTRIBUTING.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ JDK 16 and testing on a JDK 11 runtime; to do this, set `RUNTIME_JAVA_HOME`
120120
pointing to the Java home of a JDK 11 installation. Note that this mechanism can
121121
be used to test against other JDKs as well, this is not only limited to JDK 11.
122122

123-
> Note: It is also required to have `JAVA8_HOME`, `JAVA9_HOME`, `JAVA10_HOME`
124-
and `JAVA11_HOME`, `JAVA12_HOME`, `JAVA13_HOME`, `JAVA14_HOME`, and `JAVA15_HOME`
123+
> Note: It is also required to have `JAVA8_HOME`, `JAVA11_HOME`, and `JAVA17_HOME`
125124
available so that the tests can pass.
126125

127126
Elasticsearch uses the Gradle wrapper for its build. You can execute Gradle

0 commit comments

Comments
 (0)