Skip to content

Commit 230bfb3

Browse files
author
elasticsearchmachine
committed
Bump versions after 9.2.0 release
1 parent 0ef8595 commit 230bfb3

File tree

14 files changed

+35
-32
lines changed

14 files changed

+35
-32
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.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" ],
3+
"targetBranchChoices" : [ "main", "9.2", "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.2.0$" : "main",
6+
"^v9.2.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.19.6", "9.1.6", "9.2.0"]
68+
BWC_VERSION: ["8.19.6", "9.1.6", "9.2.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.2.0"]
1414
env:
1515
FWC_VERSION: "{{matrix.FWC_VERSION}}"

‎.buildkite/pipelines/periodic-java-ea.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,8 @@ steps:
385385
- signal_reason: agent_stop
386386
limit: 3
387387

388-
- label: 9.0.8 / bwc
389-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.0.8#bwcTest
388+
- label: 9.0.7 / bwc
389+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.0.7#bwcTest
390390
timeout_in_minutes: 300
391391
agents:
392392
provider: gcp
@@ -395,7 +395,7 @@ steps:
395395
buildDirectory: /dev/shm/bk
396396
preemptible: true
397397
env:
398-
BWC_VERSION: 9.0.8
398+
BWC_VERSION: 9.0.7
399399
retry:
400400
automatic:
401401
- exit_status: "-1"
@@ -423,8 +423,8 @@ steps:
423423
- signal_reason: agent_stop
424424
limit: 3
425425

426-
- label: 9.2.0 / bwc
427-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.2.0#bwcTest
426+
- label: 9.2.1 / bwc
427+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.2.1#bwcTest
428428
timeout_in_minutes: 300
429429
agents:
430430
provider: gcp
@@ -433,7 +433,7 @@ steps:
433433
buildDirectory: /dev/shm/bk
434434
preemptible: true
435435
env:
436-
BWC_VERSION: 9.2.0
436+
BWC_VERSION: 9.2.1
437437
retry:
438438
automatic:
439439
- exit_status: "-1"
@@ -519,7 +519,7 @@ steps:
519519
timeout_in_minutes: 300
520520
matrix:
521521
setup:
522-
BWC_VERSION: ["8.19.6", "9.1.6", "9.2.0"]
522+
BWC_VERSION: ["8.19.6", "9.1.6", "9.2.1"]
523523
agents:
524524
provider: gcp
525525
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pipelines/periodic-packaging.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,8 @@ steps:
350350
env:
351351
BWC_VERSION: 8.19.6
352352

353-
- label: "{{matrix.image}} / 9.0.8 / packaging-tests-upgrade"
354-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.8
353+
- label: "{{matrix.image}} / 9.0.7 / packaging-tests-upgrade"
354+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.7
355355
timeout_in_minutes: 300
356356
matrix:
357357
setup:
@@ -364,7 +364,7 @@ steps:
364364
machineType: custom-16-32768
365365
buildDirectory: /dev/shm/bk
366366
env:
367-
BWC_VERSION: 9.0.8
367+
BWC_VERSION: 9.0.7
368368

369369
- label: "{{matrix.image}} / 9.1.6 / packaging-tests-upgrade"
370370
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.6
@@ -382,8 +382,8 @@ steps:
382382
env:
383383
BWC_VERSION: 9.1.6
384384

385-
- label: "{{matrix.image}} / 9.2.0 / packaging-tests-upgrade"
386-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.0
385+
- label: "{{matrix.image}} / 9.2.1 / packaging-tests-upgrade"
386+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.1
387387
timeout_in_minutes: 300
388388
matrix:
389389
setup:
@@ -396,7 +396,7 @@ steps:
396396
machineType: custom-16-32768
397397
buildDirectory: /dev/shm/bk
398398
env:
399-
BWC_VERSION: 9.2.0
399+
BWC_VERSION: 9.2.1
400400

401401
- group: packaging-tests-windows
402402
steps:

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,8 @@ steps:
382382
- signal_reason: agent_stop
383383
limit: 3
384384

385-
- label: 9.0.8 / bwc
386-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.8#bwcTest
385+
- label: 9.0.7 / bwc
386+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.7#bwcTest
387387
timeout_in_minutes: 300
388388
agents:
389389
provider: gcp
@@ -392,7 +392,7 @@ steps:
392392
buildDirectory: /dev/shm/bk
393393
preemptible: true
394394
env:
395-
BWC_VERSION: 9.0.8
395+
BWC_VERSION: 9.0.7
396396
retry:
397397
automatic:
398398
- exit_status: "-1"
@@ -420,8 +420,8 @@ steps:
420420
- signal_reason: agent_stop
421421
limit: 3
422422

423-
- label: 9.2.0 / bwc
424-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.2.0#bwcTest
423+
- label: 9.2.1 / bwc
424+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.2.1#bwcTest
425425
timeout_in_minutes: 300
426426
agents:
427427
provider: gcp
@@ -430,7 +430,7 @@ steps:
430430
buildDirectory: /dev/shm/bk
431431
preemptible: true
432432
env:
433-
BWC_VERSION: 9.2.0
433+
BWC_VERSION: 9.2.1
434434
retry:
435435
automatic:
436436
- exit_status: "-1"
@@ -506,7 +506,7 @@ steps:
506506
setup:
507507
ES_RUNTIME_JAVA:
508508
- openjdk21
509-
BWC_VERSION: ["8.19.6", "9.1.6", "9.2.0"]
509+
BWC_VERSION: ["8.19.6", "9.1.6", "9.2.1"]
510510
agents:
511511
provider: gcp
512512
image: family/elasticsearch-ubuntu-2404
@@ -550,7 +550,7 @@ steps:
550550
ES_RUNTIME_JAVA:
551551
- openjdk21
552552
- openjdk23
553-
BWC_VERSION: ["8.19.6", "9.1.6", "9.2.0"]
553+
BWC_VERSION: ["8.19.6", "9.1.6", "9.2.1"]
554554
agents:
555555
provider: gcp
556556
image: family/elasticsearch-ubuntu-2404

‎.ci/bwcVersions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ BWC_VERSION:
1919
- "8.17.10"
2020
- "8.18.8"
2121
- "8.19.6"
22-
- "9.0.8"
22+
- "9.0.7"
2323
- "9.1.6"
24-
- "9.2.0"
24+
- "9.2.1"

‎.ci/snapshotBwcVersions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
BWC_VERSION:
22
- "8.19.6"
33
- "9.1.6"
4-
- "9.2.0"
4+
- "9.2.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.2.0
1+
elasticsearch = 9.2.1
22
lucene = 10.3.1
33

44
bundled_jdk_vendor = openjdk

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ public class Version implements VersionId<Version>, ToXContentFragment {
230230
public static final Version V_9_0_5 = new Version(9_00_05_99);
231231
public static final Version V_9_0_6 = new Version(9_00_06_99);
232232
public static final Version V_9_0_7 = new Version(9_00_07_99);
233-
public static final Version V_9_0_8 = new Version(9_00_08_99);
234233
public static final Version V_9_1_0 = new Version(9_01_00_99);
235234
public static final Version V_9_1_1 = new Version(9_01_01_99);
236235
public static final Version V_9_1_2 = new Version(9_01_02_99);
@@ -239,7 +238,8 @@ public class Version implements VersionId<Version>, ToXContentFragment {
239238
public static final Version V_9_1_5 = new Version(9_01_05_99);
240239
public static final Version V_9_1_6 = new Version(9_01_06_99);
241240
public static final Version V_9_2_0 = new Version(9_02_00_99);
242-
public static final Version CURRENT = V_9_2_0;
241+
public static final Version V_9_2_1 = new Version(9_02_01_99);
242+
public static final Version CURRENT = V_9_2_1;
243243

244244
private static final NavigableMap<Integer, Version> VERSION_IDS;
245245
private static final Map<String, Version> VERSION_STRINGS;

0 commit comments

Comments
 (0)