Bump versions after 8.10.0 release

mark-vieira · mark-vieira · commit b61a2561d4f1 · 2023-09-12T10:07:42.000-07:00
diff --git a/.backportrc.json b/.backportrc.json
@@ -1,9 +1,9 @@
 {
   "upstream" : "elastic/elasticsearch",
-  "targetBranchChoices" : [ "main", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
+  "targetBranchChoices" : [ "main", "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" : {
-    "^v8.10.0$" : "main",
+    "^v8.10.1$" : "main",
     "^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
   }
 }
diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml
@@ -40,7 +40,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["7.17.14", "8.9.3", "8.10.0"]
+            BWC_VERSION: ["7.17.14", "8.10.1"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml
@@ -1584,8 +1584,8 @@ steps:
         env:
           BWC_VERSION: 8.9.2
 
-      - label: "{{matrix.image}} / 8.9.3 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.9.3
+      - label: "{{matrix.image}} / 8.10.0 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.10.0
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -1598,10 +1598,10 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.9.3
+          BWC_VERSION: 8.10.0
 
-      - label: "{{matrix.image}} / 8.10.0 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.10.0
+      - label: "{{matrix.image}} / 8.10.1 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.10.1
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -1614,7 +1614,7 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.10.0
+          BWC_VERSION: 8.10.1
 
   - group: packaging-tests-windows
     steps:
diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml
@@ -972,26 +972,26 @@ steps:
           buildDirectory: /dev/shm/bk
         env:
           BWC_VERSION: 8.9.2
-      - label: 8.9.3 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.9.3#bwcTest
+      - label: 8.10.0 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.10.0#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
           machineType: custom-32-98304
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.9.3
-      - label: 8.10.0 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.10.0#bwcTest
+          BWC_VERSION: 8.10.0
+      - label: 8.10.1 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.10.1#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
           machineType: custom-32-98304
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.10.0
+          BWC_VERSION: 8.10.1
   - label: concurrent-search-tests
     command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true check
     timeout_in_minutes: 420
diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -96,5 +96,5 @@ BWC_VERSION:
   - "8.9.0"
   - "8.9.1"
   - "8.9.2"
-  - "8.9.3"
   - "8.10.0"
+  - "8.10.1"
diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions
@@ -1,4 +1,3 @@
 BWC_VERSION:
   - "7.17.14"
-  - "8.9.3"
-  - "8.10.0"
+  - "8.10.1"
diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -1,4 +1,4 @@
-elasticsearch     = 8.10.0
+elasticsearch     = 8.10.1
 lucene            = 9.7.0
 
 bundled_jdk_vendor = openjdk
diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java
@@ -149,9 +149,9 @@ public class Version implements VersionId<Version>, ToXContentFragment {
     public static final Version V_8_9_0 = new Version(8_09_00_99, IndexVersion.V_8_9_0);
     public static final Version V_8_9_1 = new Version(8_09_01_99, IndexVersion.V_8_9_1);
     public static final Version V_8_9_2 = new Version(8_09_02_99, IndexVersion.V_8_9_2);
-    public static final Version V_8_9_3 = new Version(8_09_03_99, IndexVersion.V_8_9_3);
     public static final Version V_8_10_0 = new Version(8_10_00_99, IndexVersion.V_8_10_0);
-    public static final Version CURRENT = V_8_10_0;
+    public static final Version V_8_10_1 = new Version(8_10_01_99, IndexVersion.V_8_10_1);
+    public static final Version CURRENT = V_8_10_1;
 
     private static final NavigableMap<Integer, Version> VERSION_IDS;
     private static final Map<String, Version> VERSION_STRINGS;
diff --git a/server/src/main/java/org/elasticsearch/index/IndexVersion.java b/server/src/main/java/org/elasticsearch/index/IndexVersion.java
@@ -180,14 +180,14 @@ private static IndexVersion registerIndexVersion(int id, Version luceneVersion,
     public static final IndexVersion V_8_9_0 = registerIndexVersion(8_09_00_99, Version.LUCENE_9_7_0, "32f6dbab-cc24-4f5b-87b5-015a848480d9");
     public static final IndexVersion V_8_9_1 = registerIndexVersion(8_09_01_99, Version.LUCENE_9_7_0, "955a80ac-f70c-40a5-9399-1d8a1e5d342d");
     public static final IndexVersion V_8_9_2 = registerIndexVersion(8_09_02_99, Version.LUCENE_9_7_0, "14c7d64c-9e25-4265-b4fa-e0c5aca67f14");
-    public static final IndexVersion V_8_9_3 = registerIndexVersion(8_09_03_99, Version.LUCENE_9_7_0, "abbd4418-1d46-4fec-8faf-758b38b205b0");
     public static final IndexVersion V_8_10_0 = registerIndexVersion(8_10_00_99, Version.LUCENE_9_7_0, "2e107286-12ad-4c51-9a6f-f8943663b6e7");
+    public static final IndexVersion V_8_10_1 = registerIndexVersion(8_10_01_99, Version.LUCENE_9_7_0, "5f4ccc3d-3769-4aef-819d-945c47b9a08b");
     /*
      * READ THE JAVADOC ABOVE BEFORE ADDING NEW INDEX VERSIONS
      * Detached index versions added below here.
      */
     private static class CurrentHolder {
-        private static final IndexVersion CURRENT = findCurrent(V_8_10_0);
+        private static final IndexVersion CURRENT = findCurrent(V_8_10_1);
 
         // finds the pluggable current version, or uses the given fallback
         private static IndexVersion findCurrent(IndexVersion fallback) {

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"upstream" : "elastic/elasticsearch",`
`3`		`- "targetBranchChoices" : [ "main", "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", "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" ],`
`4`	`4`	`"targetPRLabels" : [ "backport" ],`
`5`	`5`	`"branchLabelMapping" : {`
`6`		`- "^v8.10.0$" : "main",`
	`6`	`+ "^v8.10.1$" : "main",`
`7`	`7`	`"^v(\\d+).(\\d+).\\d+(?:-(?:alpha\|beta\|rc)\\d+)?$" : "$1.$2"`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-elasticsearch = 8.10.0`
	`1`	`+elasticsearch = 8.10.1`
`2`	`2`	`lucene = 9.7.0`
`3`	`3`
`4`	`4`	`bundled_jdk_vendor = openjdk`