瀏覽代碼

Bump versions after 9.1.4 release

elasticsearchmachine 3 周之前
父節點
當前提交
b95dbf14e1

+ 1 - 1
.backportrc.json

@@ -3,7 +3,7 @@
   "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" ],
   "targetPRLabels" : [ "backport" ],
   "branchLabelMapping" : {
-    "^v9.1.4$" : "main",
+    "^v9.1.5$" : "main",
     "^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
   }
 }

+ 1 - 1
.buildkite/pipelines/intake.yml

@@ -65,7 +65,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.4"]
+            BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.5"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2404

+ 1 - 1
.buildkite/pipelines/periodic-fwc.yml

@@ -10,6 +10,6 @@ steps:
       buildDirectory: /dev/shm/bk
     matrix:
       setup:
-        FWC_VERSION: ["9.1.0", "9.1.1", "9.1.2", "9.1.3"]
+        FWC_VERSION: ["9.1.0", "9.1.1", "9.1.2", "9.1.3", "9.1.4"]
     env:
       FWC_VERSION: "{{matrix.FWC_VERSION}}"

+ 4 - 4
.buildkite/pipelines/periodic-java-ea.yml

@@ -404,8 +404,8 @@ steps:
             - signal_reason: agent_stop
               limit: 3
 
-      - label: 9.1.4 / bwc
-        command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.4#bwcTest
+      - label: 9.1.5 / bwc
+        command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.5#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
@@ -414,7 +414,7 @@ steps:
           buildDirectory: /dev/shm/bk
           preemptible: true
         env:
-          BWC_VERSION: 9.1.4
+          BWC_VERSION: 9.1.5
         retry:
           automatic:
             - exit_status: "-1"
@@ -477,7 +477,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.4"]
+            BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.5"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2404

+ 3 - 3
.buildkite/pipelines/periodic-packaging.yml

@@ -366,8 +366,8 @@ steps:
         env:
           BWC_VERSION: 9.0.8
 
-      - label: "{{matrix.image}} / 9.1.4 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.4
+      - label: "{{matrix.image}} / 9.1.5 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.5
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -380,7 +380,7 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 9.1.4
+          BWC_VERSION: 9.1.5
 
   - group: packaging-tests-windows
     steps:

+ 5 - 5
.buildkite/pipelines/periodic.yml

@@ -401,8 +401,8 @@ steps:
             - signal_reason: agent_stop
               limit: 3
 
-      - label: 9.1.4 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.1.4#bwcTest
+      - label: 9.1.5 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.1.5#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
@@ -411,7 +411,7 @@ steps:
           buildDirectory: /dev/shm/bk
           preemptible: true
         env:
-          BWC_VERSION: 9.1.4
+          BWC_VERSION: 9.1.5
         retry:
           automatic:
             - exit_status: "-1"
@@ -487,7 +487,7 @@ steps:
           setup:
             ES_RUNTIME_JAVA:
               - openjdk21
-            BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.4"]
+            BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.5"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2404
@@ -531,7 +531,7 @@ steps:
             ES_RUNTIME_JAVA:
               - openjdk21
               - openjdk23
-            BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.4"]
+            BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.5"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2404

+ 1 - 1
.ci/bwcVersions

@@ -20,4 +20,4 @@ BWC_VERSION:
   - "8.18.8"
   - "8.19.5"
   - "9.0.8"
-  - "9.1.4"
+  - "9.1.5"

+ 1 - 1
.ci/snapshotBwcVersions

@@ -2,4 +2,4 @@ BWC_VERSION:
   - "8.18.8"
   - "8.19.5"
   - "9.0.8"
-  - "9.1.4"
+  - "9.1.5"

+ 1 - 1
build-tools-internal/version.properties

@@ -1,4 +1,4 @@
-elasticsearch     = 9.1.4
+elasticsearch     = 9.1.5
 lucene            = 10.2.2
 
 bundled_jdk_vendor = openjdk

+ 1 - 0
server/src/main/java/org/elasticsearch/TransportVersions.java

@@ -325,6 +325,7 @@ public class TransportVersions {
     public static final TransportVersion ML_INFERENCE_COHERE_API_VERSION = def(9_110_0_00);
     public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN = def(9_111_0_00);
     public static final TransportVersion INITIAL_ELASTICSEARCH_9_1_4 = def(9_112_0_07);
+    public static final TransportVersion INITIAL_ELASTICSEARCH_9_1_5 = def(9_112_0_08);
 
     /*
      * STOP! READ THIS FIRST! No, really,

+ 2 - 1
server/src/main/java/org/elasticsearch/Version.java

@@ -235,7 +235,8 @@ public class Version implements VersionId<Version>, ToXContentFragment {
     public static final Version V_9_1_2 = new Version(9_01_02_99);
     public static final Version V_9_1_3 = new Version(9_01_03_99);
     public static final Version V_9_1_4 = new Version(9_01_04_99);
-    public static final Version CURRENT = V_9_1_4;
+    public static final Version V_9_1_5 = new Version(9_01_05_99);
+    public static final Version CURRENT = V_9_1_5;
 
     private static final NavigableMap<Integer, Version> VERSION_IDS;
     private static final Map<String, Version> VERSION_STRINGS;

+ 1 - 0
server/src/main/resources/org/elasticsearch/TransportVersions.csv

@@ -176,3 +176,4 @@
 9.1.1,9112004
 9.1.2,9112005
 9.1.3,9112006
+9.1.4,9112007

+ 1 - 0
server/src/main/resources/org/elasticsearch/index/IndexVersions.csv

@@ -176,3 +176,4 @@
 9.1.1,9033000
 9.1.2,9033000
 9.1.3,9033000
+9.1.4,9033000