Merge branch '8.15' into backport/8.15/pr-112341

.backportrc.json

@@ -3,7 +3,7 @@
  "targetBranchChoices" : [ "main", "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" : {
- "^v8.15.1$" : "main",
+ "^v8.15.2$" : "main",
  "^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
  }
 }

.buildkite/pipelines/intake.yml

@@ -62,7 +62,7 @@ steps:
  timeout_in_minutes: 300
  matrix:
  setup:
- BWC_VERSION: ["7.17.24", "8.15.1"]
+ BWC_VERSION: ["7.17.25", "8.15.2"]
  agents:
  provider: gcp
  image: family/elasticsearch-ubuntu-2004

.buildkite/pipelines/periodic-packaging.yml

@@ -322,8 +322,8 @@ steps:
  env:
  BWC_VERSION: 7.16.3
 
- - label: "{{matrix.image}} / 7.17.24 / packaging-tests-upgrade"
- command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.17.24
+ - label: "{{matrix.image}} / 7.17.25 / packaging-tests-upgrade"
+ command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.17.25
  timeout_in_minutes: 300
  matrix:
  setup:
@@ -337,7 +337,7 @@ steps:
  buildDirectory: /dev/shm/bk
  diskSizeGb: 250
  env:
- BWC_VERSION: 7.17.24
+ BWC_VERSION: 7.17.25
 
  - label: "{{matrix.image}} / 8.0.1 / packaging-tests-upgrade"
  command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.0.1
@@ -594,8 +594,8 @@ steps:
  env:
  BWC_VERSION: 8.14.3
 
- - label: "{{matrix.image}} / 8.15.1 / packaging-tests-upgrade"
- command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.1
+ - label: "{{matrix.image}} / 8.15.2 / packaging-tests-upgrade"
+ command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.2
  timeout_in_minutes: 300
  matrix:
  setup:
@@ -609,7 +609,7 @@ steps:
  buildDirectory: /dev/shm/bk
  diskSizeGb: 250
  env:
- BWC_VERSION: 8.15.1
+ BWC_VERSION: 8.15.2
 
  - group: packaging-tests-windows
  steps:

.buildkite/pipelines/periodic.yml

@@ -342,8 +342,8 @@ steps:
  - signal_reason: agent_stop
  limit: 3
 
- - label: 7.17.24 / bwc
- command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.17.24#bwcTest
+ - label: 7.17.25 / bwc
+ command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.17.25#bwcTest
  timeout_in_minutes: 300
  agents:
  provider: gcp
@@ -353,7 +353,7 @@ steps:
  preemptible: true
  diskSizeGb: 250
  env:
- BWC_VERSION: 7.17.24
+ BWC_VERSION: 7.17.25
  retry:
  automatic:
  - exit_status: "-1"
@@ -662,8 +662,8 @@ steps:
  - signal_reason: agent_stop
  limit: 3
 
- - label: 8.15.1 / bwc
- command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.15.1#bwcTest
+ - label: 8.15.2 / bwc
+ command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.15.2#bwcTest
  timeout_in_minutes: 300
  agents:
  provider: gcp
@@ -673,7 +673,7 @@ steps:
  preemptible: true
  diskSizeGb: 250
  env:
- BWC_VERSION: 8.15.1
+ BWC_VERSION: 8.15.2
  retry:
  automatic:
  - exit_status: "-1"
@@ -751,7 +751,7 @@ steps:
  setup:
  ES_RUNTIME_JAVA:
  - openjdk17
- BWC_VERSION: ["7.17.24", "8.15.1"]
+ BWC_VERSION: ["7.17.25", "8.15.2"]
  agents:
  provider: gcp
  image: family/elasticsearch-ubuntu-2004
@@ -801,7 +801,7 @@ steps:
  - openjdk21
  - openjdk22
  - openjdk23
- BWC_VERSION: ["7.17.24", "8.15.1"]
+ BWC_VERSION: ["7.17.25", "8.15.2"]
  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.24"
+ - "7.17.25"
  - "8.0.1"
  - "8.1.3"
  - "8.2.3"
@@ -32,4 +32,4 @@ BWC_VERSION:
  - "8.12.2"
  - "8.13.4"
  - "8.14.3"
- - "8.15.1"
+ - "8.15.2"

.ci/snapshotBwcVersions

@@ -1,3 +1,3 @@
 BWC_VERSION:
- - "7.17.24"
- - "8.15.1"
+ - "7.17.25"
+ - "8.15.2"

build-tools-internal/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=682b4df7fe5accdca84a4d1ef6a3a6ab096b3efd5edf7de2bd8c758d95a93703
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
+distributionSha256Sum=fdfca5dbc2834f0ece5020465737538e5ba679deeff5ab6c09621d67f8bb1a15
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/test/rest/LegacyYamlRestCompatTestPluginFuncTest.groovy

@@ -55,8 +55,7 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
  def result = gradleRunner("yamlRestTestV${compatibleVersion}CompatTest", '--stacktrace').build()
 
  then:
- // we set the task to be skipped if there are no matching tests in the compatibility test sourceSet
- result.task(":yamlRestTestV${compatibleVersion}CompatTest").outcome == TaskOutcome.SKIPPED
+ result.task(":yamlRestTestV${compatibleVersion}CompatTest").outcome == TaskOutcome.NO_SOURCE
  result.task(':copyRestCompatApiTask').outcome == TaskOutcome.NO_SOURCE
  result.task(':copyRestCompatTestTask').outcome == TaskOutcome.NO_SOURCE
  result.task(transformTask).outcome == TaskOutcome.NO_SOURCE
@@ -165,7 +164,7 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
  then:
  result.task(':check').outcome == TaskOutcome.UP_TO_DATE
  result.task(':checkRestCompat').outcome == TaskOutcome.UP_TO_DATE
- result.task(":yamlRestTestV${compatibleVersion}CompatTest").outcome == TaskOutcome.SKIPPED
+ result.task(":yamlRestTestV${compatibleVersion}CompatTest").outcome == TaskOutcome.NO_SOURCE
  result.task(':copyRestCompatApiTask').outcome == TaskOutcome.NO_SOURCE
  result.task(':copyRestCompatTestTask').outcome == TaskOutcome.NO_SOURCE
  result.task(transformTask).outcome == TaskOutcome.NO_SOURCE

build-tools-internal/src/main/groovy/elasticsearch.ide.gradle

@@ -167,7 +167,7 @@ if (providers.systemProperty('idea.active').getOrNull() == 'true') {
  vmParameters = [
  '-ea',
  '-Djava.security.manager=allow',
- '-Djava.locale.providers=SPI,COMPAT',
+ '-Djava.locale.providers=SPI,CLDR',
  '-Djava.library.path=' + testLibraryPath,
  '-Djna.library.path=' + testLibraryPath,
  // TODO: only open these for mockito when it is modularized

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchTestBasePlugin.java

@@ -92,7 +92,7 @@ public void execute(Task t) {
  mkdirs(test.getWorkingDir().toPath().resolve("temp").toFile());
 
  // TODO remove once jvm.options are added to test system properties
- test.systemProperty("java.locale.providers", "SPI,COMPAT");
+ test.systemProperty("java.locale.providers", "SPI,CLDR");
  }
  });
  test.getJvmArgumentProviders().add(nonInputProperties);

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/AbstractYamlRestCompatTestPlugin.java

@@ -35,6 +35,7 @@
 import org.gradle.api.tasks.Sync;
 import org.gradle.api.tasks.TaskProvider;
 import org.gradle.api.tasks.testing.Test;
+import org.gradle.language.jvm.tasks.ProcessResources;
 
 import java.io.File;
 import java.nio.file.Path;
@@ -213,6 +214,17 @@ public void apply(Project project) {
  .named(RestResourcesPlugin.COPY_YAML_TESTS_TASK)
  .flatMap(CopyRestTestsTask::getOutputResourceDir);
 
+ // ensure we include other non rest spec related test resources
+ project.getTasks()
+ .withType(ProcessResources.class)
+ .named(yamlCompatTestSourceSet.getProcessResourcesTaskName())
+ .configure(processResources -> {
+ processResources.from(
+ sourceSets.getByName(YamlRestTestPlugin.YAML_REST_TEST).getResources(),
+ spec -> { spec.exclude("rest-api-spec/**"); }
+ );
+ });
+
  // setup the test task
  TaskProvider<? extends Test> yamlRestCompatTestTask = registerTestTask(project, yamlCompatTestSourceSet);
  yamlRestCompatTestTask.configure(testTask -> {
@@ -221,7 +233,7 @@ public void apply(Project project) {
  testTask.setTestClassesDirs(
  yamlTestSourceSet.getOutput().getClassesDirs().plus(yamlCompatTestSourceSet.getOutput().getClassesDirs())
  );
- testTask.onlyIf("Compatibility tests are available", t -> yamlCompatTestSourceSet.getAllSource().isEmpty() == false);
+ testTask.onlyIf("Compatibility tests are available", t -> yamlCompatTestSourceSet.getOutput().isEmpty() == false);
  testTask.setClasspath(
  yamlCompatTestSourceSet.getRuntimeClasspath()
  // remove the "normal" api and tests

build-tools-internal/src/main/resources/minimumGradleVersion

@@ -1 +1 @@
-8.10
+8.10.1

build-tools-internal/version.properties

@@ -1,4 +1,4 @@
-elasticsearch = 8.15.1
+elasticsearch = 8.15.2
 lucene = 9.11.1
 
 bundled_jdk_vendor = openjdk

distribution/docker/src/docker/Dockerfile

@@ -22,7 +22,7 @@
 <% if (docker_base == 'iron_bank') { %>
 ARG BASE_REGISTRY=registry1.dso.mil
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi9
-ARG BASE_TAG=9.3
+ARG BASE_TAG=9.4
 <% } %>
 
 ################################################################################

distribution/docker/src/docker/iron_bank/hardening_manifest.yaml

@@ -14,7 +14,7 @@ tags:
 # Build args passed to Dockerfile ARGs
 args:
  BASE_IMAGE: "redhat/ubi/ubi9"
- BASE_TAG: "9.3"
+ BASE_TAG: "9.4"
 
 # Docker image labels
 labels:

distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/SystemJvmOptions.java

@@ -11,6 +11,7 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.EsExecutors;
 import org.elasticsearch.core.SuppressForbidden;
+import org.elasticsearch.core.UpdateForV9;
 
 import java.io.File;
 import java.nio.file.Path;
@@ -64,11 +65,7 @@ static List<String> systemJvmOptions(Settings nodeSettings, final Map<String, St
  "-Dlog4j.shutdownHookEnabled=false",
  "-Dlog4j2.disable.jmx=true",
  "-Dlog4j2.formatMsgNoLookups=true",
- /*
- * Due to internationalization enhancements in JDK 9 Elasticsearch need to set the provider to COMPAT otherwise time/date
- * parsing will break in an incompatible way for some date patterns and locales.
- */
- "-Djava.locale.providers=SPI,COMPAT",
+ "-Djava.locale.providers=" + getLocaleProviders(),
  /*
  * Temporarily suppress illegal reflective access in searchable snapshots shared cache preallocation; this is temporary
  * while we explore alternatives. See org.elasticsearch.xpack.searchablesnapshots.preallocate.Preallocate.
@@ -87,6 +84,16 @@ static List<String> systemJvmOptions(Settings nodeSettings, final Map<String, St
  ).filter(e -> e.isEmpty() == false).collect(Collectors.toList());
  }
 
+ @UpdateForV9 // only use CLDR in v9+
+ private static String getLocaleProviders() {
+ /*
+ * Specify SPI to load IsoCalendarDataProvider (see #48209), specifying the first day of week as Monday.
+ * When on pre-23, use COMPAT instead to maintain existing date formats as much as we can.
+ * When on JDK 23+, use the default CLDR locale database, as COMPAT was removed in JDK 23.
+ */
+ return Runtime.version().feature() >= 23 ? "SPI,CLDR" : "SPI,COMPAT";
+ }
+
  /*
  * The virtual file /proc/self/cgroup should list the current cgroup
  * membership. For each hierarchy, you can follow the cgroup path from

docs/changelog/111519.yaml

@@ -0,0 +1,5 @@
+pr: 111519
+summary: "ESQL: Don't mutate the `BoolQueryBuilder` in plan"
+area: ES|QL
+type: bug
+issues: []

docs/changelog/111535.yaml

@@ -0,0 +1,5 @@
+pr: 111535
+summary: Fix remote cluster credential secure settings reload
+area: Authorization
+type: bug
+issues: []

docs/changelog/111548.yaml

@@ -0,0 +1,6 @@
+pr: 111548
+summary: Json parsing exceptions should not cause 500 errors
+area: Infra/Core
+type: bug
+issues:
+ - 111542

docs/changelog/111932.yaml

@@ -0,0 +1,6 @@
+pr: 111932
+summary: Fix union-types where one index is missing the field
+area: ES|QL
+type: bug
+issues:
+ - 111912