Merge branch '8.x' into 8x-inference-index-fix

# Conflicts:
#	muted-tests.yml

Author: davidkyle

.buildkite/pipelines/intake.yml

@@ -56,7 +56,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["7.17.25", "8.15.4", "8.16.0", "8.17.0"]
+            BWC_VERSION: ["7.17.26", "8.15.4", "8.16.0", "8.17.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

.buildkite/pipelines/periodic-packaging.yml

@@ -303,8 +303,8 @@ steps:
         env:
           BWC_VERSION: 7.16.3
 
-      - label: "{{matrix.image}} / 7.17.25 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.17.25
+      - label: "{{matrix.image}} / 7.17.26 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.17.26
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -317,7 +317,7 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 7.17.25
+          BWC_VERSION: 7.17.26
 
       - label: "{{matrix.image}} / 8.0.1 / packaging-tests-upgrade"
         command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.0.1

.buildkite/pipelines/periodic.yml

@@ -325,8 +325,8 @@ steps:
             - signal_reason: agent_stop
               limit: 3
 
-      - label: 7.17.25 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.17.25#bwcTest
+      - label: 7.17.26 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.17.26#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
@@ -335,7 +335,7 @@ steps:
           buildDirectory: /dev/shm/bk
           preemptible: true
         env:
-          BWC_VERSION: 7.17.25
+          BWC_VERSION: 7.17.26
         retry:
           automatic:
             - exit_status: "-1"
@@ -752,7 +752,7 @@ steps:
           setup:
             ES_RUNTIME_JAVA:
               - openjdk17
-            BWC_VERSION: ["7.17.25", "8.15.4", "8.16.0", "8.17.0"]
+            BWC_VERSION: ["7.17.26", "8.15.4", "8.16.0", "8.17.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
@@ -800,7 +800,7 @@ steps:
               - openjdk21
               - openjdk22
               - openjdk23
-            BWC_VERSION: ["7.17.25", "8.15.4", "8.16.0", "8.17.0"]
+            BWC_VERSION: ["7.17.26", "8.15.4", "8.16.0", "8.17.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

.ci/bwcVersions

@@ -16,7 +16,7 @@ BWC_VERSION:
   - "7.14.2"
   - "7.15.2"
   - "7.16.3"
-  - "7.17.25"
+  - "7.17.26"
   - "8.0.1"
   - "8.1.3"
   - "8.2.3"

.ci/snapshotBwcVersions

@@ -1,5 +1,5 @@
 BWC_VERSION:
-  - "7.17.25"
+  - "7.17.26"
   - "8.15.4"
   - "8.16.0"
   - "8.17.0"

build-tools-internal/version.properties

@@ -2,7 +2,7 @@ elasticsearch     = 8.17.0
 lucene            = 9.12.0
 
 bundled_jdk_vendor = openjdk
-bundled_jdk = 22.0.1+8@c7ec1332f7bb44aeba2eb341ae18aca4
+bundled_jdk = 23+37@3c5b90190c68498b986a97f276efd28a
 # optional dependencies
 spatial4j         = 0.7
 jts               = 1.15.0

docs/changelog/114002.yaml

@@ -0,0 +1,6 @@
+pr: 115102
+summary: Watch Next Run Interval Resets On Shard Move or Node Restart
+area: Watcher
+type: bug
+issues:
+ - 111433

docs/changelog/115102.yaml

@@ -0,0 +1,5 @@
+pr: 115317
+summary: Revert "Add `ResolvedExpression` wrapper"
+area: Indices APIs
+type: bug
+issues: []

docs/changelog/115317.yaml

@@ -0,0 +1,6 @@
+pr: 115359
+summary: Adding support for simulate ingest mapping adddition for indices with mappings
+  that do not come from templates
+area: Ingest Node
+type: enhancement
+issues: []