diff --git a/.backportrc.json b/.backportrc.json index 4af6031c8e11..7626417b7811 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -3,7 +3,7 @@ "targetBranchChoices" : [ "main", "9.0", "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.0.2$" : "main", + "^v9.0.3$" : "main", "^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2" } } \ No newline at end of file diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml index 226f595f4e4b..70f20ccd7857 100644 --- a/.buildkite/pipelines/intake.yml +++ b/.buildkite/pipelines/intake.yml @@ -56,7 +56,7 @@ steps: timeout_in_minutes: 300 matrix: setup: - BWC_VERSION: ["8.17.7", "8.18.3", "9.0.2"] + BWC_VERSION: ["8.17.7", "8.18.3", "9.0.3"] agents: provider: gcp image: family/elasticsearch-ubuntu-2004 diff --git a/.buildkite/pipelines/periodic-fwc.yml b/.buildkite/pipelines/periodic-fwc.yml index 33ba175ae210..3d450a869111 100644 --- 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: ["9.0.0", "9.0.1"] + FWC_VERSION: ["9.0.0", "9.0.1", "9.0.2"] env: FWC_VERSION: $FWC_VERSION diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml index 5bca6061bbf9..2c8749e07f0a 100644 --- a/.buildkite/pipelines/periodic-packaging.yml +++ b/.buildkite/pipelines/periodic-packaging.yml @@ -335,8 +335,8 @@ steps: env: BWC_VERSION: 8.18.3 - - label: "{{matrix.image}} / 9.0.2 / packaging-tests-upgrade" - command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.2 + - label: "{{matrix.image}} / 9.0.3 / packaging-tests-upgrade" + command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.3 timeout_in_minutes: 300 matrix: setup: @@ -349,7 +349,7 @@ steps: machineType: custom-16-32768 buildDirectory: /dev/shm/bk env: - BWC_VERSION: 9.0.2 + BWC_VERSION: 9.0.3 - group: packaging-tests-windows steps: diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml index 0dc59be98876..118c4664e4ab 100644 --- a/.buildkite/pipelines/periodic.yml +++ b/.buildkite/pipelines/periodic.yml @@ -363,8 +363,8 @@ steps: - signal_reason: agent_stop limit: 3 - - label: 9.0.2 / bwc - command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.2#bwcTest + - label: 9.0.3 / bwc + command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.3#bwcTest timeout_in_minutes: 300 agents: provider: gcp @@ -373,7 +373,7 @@ steps: buildDirectory: /dev/shm/bk preemptible: true env: - BWC_VERSION: 9.0.2 + BWC_VERSION: 9.0.3 retry: automatic: - exit_status: "-1" @@ -448,7 +448,7 @@ steps: setup: ES_RUNTIME_JAVA: - openjdk21 - BWC_VERSION: ["8.17.7", "8.18.3", "9.0.2"] + BWC_VERSION: ["8.17.7", "8.18.3", "9.0.3"] agents: provider: gcp image: family/elasticsearch-ubuntu-2004 @@ -490,7 +490,7 @@ steps: ES_RUNTIME_JAVA: - openjdk21 - openjdk23 - BWC_VERSION: ["8.17.7", "8.18.3", "9.0.2"] + BWC_VERSION: ["8.17.7", "8.18.3", "9.0.3"] agents: provider: gcp image: family/elasticsearch-ubuntu-2004 diff --git a/.ci/bwcVersions b/.ci/bwcVersions index d15fcd331d12..92d90e400a4d 100644 --- a/.ci/bwcVersions +++ b/.ci/bwcVersions @@ -18,4 +18,4 @@ BWC_VERSION: - "8.16.6" - "8.17.7" - "8.18.3" - - "9.0.2" + - "9.0.3" diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions index 01336975e01d..627ebd653e79 100644 --- a/.ci/snapshotBwcVersions +++ b/.ci/snapshotBwcVersions @@ -1,4 +1,4 @@ BWC_VERSION: - "8.17.7" - "8.18.3" - - "9.0.2" + - "9.0.3" diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index b5899f8c6f37..9749bd9c02f2 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -1,4 +1,4 @@ -elasticsearch = 9.0.2 +elasticsearch = 9.0.3 lucene = 10.1.0 bundled_jdk_vendor = openjdk diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java index b910c7c62005..cc6963a9d3fa 100644 --- a/server/src/main/java/org/elasticsearch/TransportVersions.java +++ b/server/src/main/java/org/elasticsearch/TransportVersions.java @@ -197,6 +197,7 @@ public class TransportVersions { public static final TransportVersion STORED_SCRIPT_CONTENT_LENGTH_90 = def(9_000_0_09); public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10); public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_2 = def(9_000_0_11); + public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_3 = def(9_000_0_12); /* * STOP! READ THIS FIRST! No, really, diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java index a160d648f306..6939e6c37261 100644 --- a/server/src/main/java/org/elasticsearch/Version.java +++ b/server/src/main/java/org/elasticsearch/Version.java @@ -210,7 +210,8 @@ public class Version implements VersionId, ToXContentFragment { public static final Version V_9_0_0 = new Version(9_00_00_99); public static final Version V_9_0_1 = new Version(9_00_01_99); public static final Version V_9_0_2 = new Version(9_00_02_99); - public static final Version CURRENT = V_9_0_2; + public static final Version V_9_0_3 = new Version(9_00_03_99); + public static final Version CURRENT = V_9_0_3; private static final NavigableMap VERSION_IDS; private static final Map VERSION_STRINGS; diff --git a/server/src/main/resources/org/elasticsearch/TransportVersions.csv b/server/src/main/resources/org/elasticsearch/TransportVersions.csv index 36535c1532db..7c35b0331a7b 100644 --- a/server/src/main/resources/org/elasticsearch/TransportVersions.csv +++ b/server/src/main/resources/org/elasticsearch/TransportVersions.csv @@ -152,3 +152,4 @@ 8.18.2,8840004 9.0.0,9000009 9.0.1,9000010 +9.0.2,9000011 diff --git a/server/src/main/resources/org/elasticsearch/index/IndexVersions.csv b/server/src/main/resources/org/elasticsearch/index/IndexVersions.csv index 24d29693127b..f19c06396ac8 100644 --- a/server/src/main/resources/org/elasticsearch/index/IndexVersions.csv +++ b/server/src/main/resources/org/elasticsearch/index/IndexVersions.csv @@ -152,3 +152,4 @@ 8.18.2,8525000 9.0.0,9009000 9.0.1,9009000 +9.0.2,9009000