Skip to content

Commit 90bd95e

Browse files
author
elasticsearchmachine
committed
Bump versions after 9.1.0 release
1 parent d8c02dc commit 90bd95e

File tree

12 files changed

+20
-54
lines changed

12 files changed

+20
-54
lines changed

‎.backportrc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"upstream" : "elastic/elasticsearch",
3-
"targetBranchChoices" : [ "main", "9.0", "8.19", "8.18", "8.17", "8.16", "8.15", "8.14", "8.13", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
3+
"targetBranchChoices" : [ "main", "9.1", "9.0", "8.19", "8.18", "8.17", "8.16", "8.15", "8.14", "8.13", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
44
"targetPRLabels" : [ "backport" ],
55
"branchLabelMapping" : {
6-
"^v9.1.0$" : "main",
6+
"^v9.1.1$" : "main",
77
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
88
}
99
}

‎.buildkite/pipelines/intake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ steps:
6565
timeout_in_minutes: 300
6666
matrix:
6767
setup:
68-
BWC_VERSION: ["8.17.10", "8.18.5", "8.19.0", "9.0.5", "9.1.0"]
68+
BWC_VERSION: ["8.17.10", "8.18.5", "9.0.5", "9.1.1"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pipelines/periodic-fwc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ steps:
1010
buildDirectory: /dev/shm/bk
1111
matrix:
1212
setup:
13-
FWC_VERSION: []
13+
FWC_VERSION: ["9.1.0"]
1414
env:
1515
FWC_VERSION: $FWC_VERSION

‎.buildkite/pipelines/periodic-packaging.yml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -334,22 +334,6 @@ steps:
334334
env:
335335
BWC_VERSION: 8.18.5
336336

337-
- label: "{{matrix.image}} / 8.19.0 / packaging-tests-upgrade"
338-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.0
339-
timeout_in_minutes: 300
340-
matrix:
341-
setup:
342-
image:
343-
- rocky-8
344-
- ubuntu-2404
345-
agents:
346-
provider: gcp
347-
image: family/elasticsearch-{{matrix.image}}
348-
machineType: custom-16-32768
349-
buildDirectory: /dev/shm/bk
350-
env:
351-
BWC_VERSION: 8.19.0
352-
353337
- label: "{{matrix.image}} / 9.0.5 / packaging-tests-upgrade"
354338
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.5
355339
timeout_in_minutes: 300
@@ -366,8 +350,8 @@ steps:
366350
env:
367351
BWC_VERSION: 9.0.5
368352

369-
- label: "{{matrix.image}} / 9.1.0 / packaging-tests-upgrade"
370-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.0
353+
- label: "{{matrix.image}} / 9.1.1 / packaging-tests-upgrade"
354+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.1
371355
timeout_in_minutes: 300
372356
matrix:
373357
setup:
@@ -380,7 +364,7 @@ steps:
380364
machineType: custom-16-32768
381365
buildDirectory: /dev/shm/bk
382366
env:
383-
BWC_VERSION: 9.1.0
367+
BWC_VERSION: 9.1.1
384368

385369
- group: packaging-tests-windows
386370
steps:

‎.buildkite/pipelines/periodic.yml

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -363,25 +363,6 @@ steps:
363363
- signal_reason: agent_stop
364364
limit: 3
365365

366-
- label: 8.19.0 / bwc
367-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.19.0#bwcTest
368-
timeout_in_minutes: 300
369-
agents:
370-
provider: gcp
371-
image: family/elasticsearch-ubuntu-2404
372-
machineType: n1-standard-32
373-
buildDirectory: /dev/shm/bk
374-
preemptible: true
375-
env:
376-
BWC_VERSION: 8.19.0
377-
retry:
378-
automatic:
379-
- exit_status: "-1"
380-
limit: 3
381-
signal_reason: none
382-
- signal_reason: agent_stop
383-
limit: 3
384-
385366
- label: 9.0.5 / bwc
386367
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.5#bwcTest
387368
timeout_in_minutes: 300
@@ -401,8 +382,8 @@ steps:
401382
- signal_reason: agent_stop
402383
limit: 3
403384

404-
- label: 9.1.0 / bwc
405-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.1.0#bwcTest
385+
- label: 9.1.1 / bwc
386+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.1.1#bwcTest
406387
timeout_in_minutes: 300
407388
agents:
408389
provider: gcp
@@ -411,7 +392,7 @@ steps:
411392
buildDirectory: /dev/shm/bk
412393
preemptible: true
413394
env:
414-
BWC_VERSION: 9.1.0
395+
BWC_VERSION: 9.1.1
415396
retry:
416397
automatic:
417398
- exit_status: "-1"
@@ -487,7 +468,7 @@ steps:
487468
setup:
488469
ES_RUNTIME_JAVA:
489470
- openjdk21
490-
BWC_VERSION: ["8.17.10", "8.18.5", "8.19.0", "9.0.5", "9.1.0"]
471+
BWC_VERSION: ["8.17.10", "8.18.5", "9.0.5", "9.1.1"]
491472
agents:
492473
provider: gcp
493474
image: family/elasticsearch-ubuntu-2404
@@ -531,7 +512,7 @@ steps:
531512
ES_RUNTIME_JAVA:
532513
- openjdk21
533514
- openjdk23
534-
BWC_VERSION: ["8.17.10", "8.18.5", "8.19.0", "9.0.5", "9.1.0"]
515+
BWC_VERSION: ["8.17.10", "8.18.5", "9.0.5", "9.1.1"]
535516
agents:
536517
provider: gcp
537518
image: family/elasticsearch-ubuntu-2404

‎.ci/bwcVersions

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@ BWC_VERSION:
1818
- "8.16.6"
1919
- "8.17.10"
2020
- "8.18.5"
21-
- "8.19.0"
2221
- "9.0.5"
23-
- "9.1.0"
22+
- "9.1.1"

‎.ci/snapshotBwcVersions

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
BWC_VERSION:
22
- "8.17.10"
33
- "8.18.5"
4-
- "8.19.0"
54
- "9.0.5"
6-
- "9.1.0"
5+
- "9.1.1"

‎build-tools-internal/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
elasticsearch = 9.1.0
1+
elasticsearch = 9.1.1
22
lucene = 10.2.2
33

44
bundled_jdk_vendor = openjdk

‎server/src/main/java/org/elasticsearch/TransportVersions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@ static TransportVersion def(int id) {
333333
public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES_9_1 = def(9_112_0_01);
334334
public static final TransportVersion ESQL_FIXED_INDEX_LIKE_9_1 = def(9_112_0_02);
335335
public static final TransportVersion ESQL_SAMPLE_OPERATOR_STATUS_9_1 = def(9_112_0_03);
336+
public static final TransportVersion INITIAL_ELASTICSEARCH_9_1_1 = def(9_112_0_04);
336337

337338
/*
338339
* STOP! READ THIS FIRST! No, really,

‎server/src/main/java/org/elasticsearch/Version.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,15 +212,15 @@ public class Version implements VersionId<Version>, ToXContentFragment {
212212
public static final Version V_8_18_3 = new Version(8_18_03_99);
213213
public static final Version V_8_18_4 = new Version(8_18_04_99);
214214
public static final Version V_8_18_5 = new Version(8_18_05_99);
215-
public static final Version V_8_19_0 = new Version(8_19_00_99);
216215
public static final Version V_9_0_0 = new Version(9_00_00_99);
217216
public static final Version V_9_0_1 = new Version(9_00_01_99);
218217
public static final Version V_9_0_2 = new Version(9_00_02_99);
219218
public static final Version V_9_0_3 = new Version(9_00_03_99);
220219
public static final Version V_9_0_4 = new Version(9_00_04_99);
221220
public static final Version V_9_0_5 = new Version(9_00_05_99);
222221
public static final Version V_9_1_0 = new Version(9_01_00_99);
223-
public static final Version CURRENT = V_9_1_0;
222+
public static final Version V_9_1_1 = new Version(9_01_01_99);
223+
public static final Version CURRENT = V_9_1_1;
224224

225225
private static final NavigableMap<Integer, Version> VERSION_IDS;
226226
private static final Map<String, Version> VERSION_STRINGS;

0 commit comments

Comments
 (0)