Bump versions after 8.18.1 release

2025-05-06 15:18:49 +00:00 · 2025-05-06 15:18:49 +00:00 · 9941e31b7c
parent 95d025d456
commit 9941e31b7c
12 changed files with 19 additions and 15 deletions
--- a/.backportrc.json
+++ b/.backportrc.json
@ -3,7 +3,7 @@
  "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" ],
  "targetPRLabels" : [ "backport" ],
  "branchLabelMapping" : {
-    "^v9.1.0$" : "main",
+    "^v8.18.2$" : "main",
    "^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
  }
 }
--- a/.buildkite/pipelines/intake.yml
+++ b/.buildkite/pipelines/intake.yml
@ -56,7 +56,7 @@ steps:
        timeout_in_minutes: 300
        matrix:
          setup:
-            BWC_VERSION: ["7.17.29", "8.17.6", "8.18.1"]
+            BWC_VERSION: ["7.17.29", "8.17.6", "8.18.2"]
        agents:
          provider: gcp
          image: family/elasticsearch-ubuntu-2004
--- a/.buildkite/pipelines/periodic-fwc.yml
+++ b/.buildkite/pipelines/periodic-fwc.yml
@ -10,6 +10,6 @@ steps:
      buildDirectory: /dev/shm/bk
    matrix:
      setup:
-        FWC_VERSION: ["8.18.0"]
+        FWC_VERSION: ["8.18.0", "8.18.1"]
    env:
      FWC_VERSION: $FWC_VERSION
--- a/.buildkite/pipelines/periodic-packaging.yml
+++ b/.buildkite/pipelines/periodic-packaging.yml
@ -611,8 +611,8 @@ steps:
        env:
          BWC_VERSION: 8.17.6

-      - label: "{{matrix.image}} / 8.18.1 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.1
+      - label: "{{matrix.image}} / 8.18.2 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.2
        timeout_in_minutes: 300
        matrix:
          setup:
@ -625,7 +625,7 @@ steps:
          machineType: custom-16-32768
          buildDirectory: /dev/shm/bk
        env:
-          BWC_VERSION: 8.18.1
+          BWC_VERSION: 8.18.2

  - group: packaging-tests-windows
    steps:
--- a/.buildkite/pipelines/periodic.yml
+++ b/.buildkite/pipelines/periodic.yml
@ -686,8 +686,8 @@ steps:
            - signal_reason: agent_stop
              limit: 3

-      - label: 8.18.1 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.1#bwcTest
+      - label: 8.18.2 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.2#bwcTest
        timeout_in_minutes: 300
        agents:
          provider: gcp
@ -696,7 +696,7 @@ steps:
          buildDirectory: /dev/shm/bk
          preemptible: true
        env:
-          BWC_VERSION: 8.18.1
+          BWC_VERSION: 8.18.2
        retry:
          automatic:
            - exit_status: "-1"
@ -771,7 +771,7 @@ steps:
          setup:
            ES_RUNTIME_JAVA:
              - openjdk17
-            BWC_VERSION: ["7.17.29", "8.17.6", "8.18.1"]
+            BWC_VERSION: ["7.17.29", "8.17.6", "8.18.2"]
        agents:
          provider: gcp
          image: family/elasticsearch-ubuntu-2004
@ -819,7 +819,7 @@ steps:
              - openjdk21
              - openjdk22
              - openjdk23
-            BWC_VERSION: ["7.17.29", "8.17.6", "8.18.1"]
+            BWC_VERSION: ["7.17.29", "8.17.6", "8.18.2"]
        agents:
          provider: gcp
          image: family/elasticsearch-ubuntu-2004
--- a/.ci/bwcVersions
+++ b/.ci/bwcVersions
@ -35,4 +35,4 @@ BWC_VERSION:
  - "8.15.5"
  - "8.16.6"
  - "8.17.6"
-  - "8.18.1"
+  - "8.18.2"
--- a/.ci/snapshotBwcVersions
+++ b/.ci/snapshotBwcVersions
@ -1,4 +1,4 @@
 BWC_VERSION:
  - "7.17.29"
  - "8.17.6"
-  - "8.18.1"
+  - "8.18.2"
--- a/build-tools-internal/version.properties
+++ b/build-tools-internal/version.properties
@ -1,4 +1,4 @@
-elasticsearch     = 8.18.1
+elasticsearch     = 8.18.2
 lucene            = 9.12.1

 bundled_jdk_vendor = openjdk
--- a/server/src/main/java/org/elasticsearch/TransportVersions.java
+++ b/server/src/main/java/org/elasticsearch/TransportVersions.java
@ -188,6 +188,7 @@ public class TransportVersions {
    public static final TransportVersion REMOVE_ALL_APPLICABLE_SELECTOR_BACKPORT_8_18 = def(8_840_00_1);
    public static final TransportVersion RETRY_ILM_ASYNC_ACTION_REQUIRE_ERROR_8_18 = def(8_840_0_02);
    public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_1 = def(8_840_0_03);
+    public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_2 = def(8_840_0_04);

    /*
     * STOP! READ THIS FIRST! No, really,
--- a/server/src/main/java/org/elasticsearch/Version.java
+++ b/server/src/main/java/org/elasticsearch/Version.java
@ -208,7 +208,8 @@ public class Version implements VersionId<Version>, ToXContentFragment {
    public static final Version V_8_17_6 = new Version(8_17_06_99);
    public static final Version V_8_18_0 = new Version(8_18_00_99);
    public static final Version V_8_18_1 = new Version(8_18_01_99);
-    public static final Version CURRENT = V_8_18_1;
+    public static final Version V_8_18_2 = new Version(8_18_02_99);
+    public static final Version CURRENT = V_8_18_2;

    private static final NavigableMap<Integer, Version> VERSION_IDS;
    private static final Map<String, Version> VERSION_STRINGS;
--- a/server/src/main/resources/org/elasticsearch/TransportVersions.csv
+++ b/server/src/main/resources/org/elasticsearch/TransportVersions.csv
@ -151,3 +151,4 @@
 8.17.4,8797004
 8.17.5,8797005
 8.18.0,8840002
+8.18.1,8840003
--- a/server/src/main/resources/org/elasticsearch/index/IndexVersions.csv
+++ b/server/src/main/resources/org/elasticsearch/index/IndexVersions.csv
@ -151,3 +151,4 @@
 8.17.4,8521000
 8.17.5,8521000
 8.18.0,8525000
+8.18.1,8525000