Bump to version 8.5.0

.backportrc.json

@@ -1,17 +1,9 @@
 {
-  "upstream": "elastic/elasticsearch",
-  "targetBranchChoices": [
-    "main",
-    "8.3",
-    "8.2",
-    "8.1",
-    "8.0",
-    "7.17",
-    "6.8"
-  ],
-  "targetPRLabels": ["backport"],
-  "branchLabelMapping": {
-    "^v8.4.0$": "main",
-    "^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$": "$1.$2"
+  "upstream" : "elastic/elasticsearch",
+  "targetBranchChoices" : [ "main", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
+  "targetPRLabels" : [ "backport" ],
+  "branchLabelMapping" : {
+    "^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2",
+    "^v8.5.0$" : "main"
   }
-}
+}

.ci/bwcVersions

@@ -70,3 +70,4 @@ BWC_VERSION:
   - "8.3.2"
   - "8.3.3"
   - "8.4.0"
+  - "8.5.0"

.ci/snapshotBwcVersions

@@ -2,3 +2,4 @@ BWC_VERSION:
   - "7.17.6"
   - "8.3.3"
   - "8.4.0"
+  - "8.5.0"

build-tools-internal/version.properties

@@ -1,4 +1,4 @@
-elasticsearch     = 8.4.0
+elasticsearch     = 8.5.0
 lucene            = 9.3.0-snapshot-b8d1fcfd0ec
 
 bundled_jdk_vendor = openjdk

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

@@ -118,7 +118,8 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_8_3_2 = new Version(8_03_02_99, org.apache.lucene.util.Version.LUCENE_9_2_0);
     public static final Version V_8_3_3 = new Version(8_03_03_99, org.apache.lucene.util.Version.LUCENE_9_2_0);
     public static final Version V_8_4_0 = new Version(8_04_00_99, org.apache.lucene.util.Version.LUCENE_9_3_0);
-    public static final Version CURRENT = V_8_4_0;
+    public static final Version V_8_5_0 = new Version(8_05_00_99, org.apache.lucene.util.Version.LUCENE_9_3_0);
+    public static final Version CURRENT = V_8_5_0;
 
     private static final Map<Integer, Version> idToVersion;
     private static final Map<String, Version> stringToVersion;