Merge branch '9.0' into backport/9.0/pr-136433

Author: davidkyle

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

@@ -21,6 +21,17 @@ import java.nio.file.StandardCopyOption
 allprojects {
   apply plugin: 'idea'
 
+  // We got reports of invalid idea classpaths when major classpath changes (e.g. lucene update)
+  // has been merged and developers switching back and forth. This should enforce idea
+  // to not try to be smart.
+  // This enforces A "complete rewrite" causing all existing content to be discarded,
+  // thereby losing any changes made directly in the IDE but that should be fine for us.
+  idea.module.iml {
+    beforeMerged { module ->
+      module.dependencies.clear()
+    }
+  }
+
   tasks.named('idea').configure {
     doFirst { throw new GradleException("Use of the 'idea' task has been deprecated. For details on importing into IntelliJ see CONTRIBUTING.md.") }
   }

distribution/docker/src/docker/dockerfiles/cloud_ess_fips/Dockerfile

@@ -25,7 +25,7 @@
 # Extract Elasticsearch artifact
 ################################################################################
 
-FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:66f42b0e522fac4058c1e0056e89a8db18b1d28b49ce9c785f6ab68a509ec2cc AS builder
+FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:2229af4333f2ba23bdcb3b8bcd96903fb568da636519de774ee4b1fe21ea5912 AS builder
 
 # Install required packages to extract the Elasticsearch distribution
 RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -104,7 +104,7 @@ WORKDIR /usr/share/elasticsearch/config
 # Add entrypoint
 ################################################################################
 
-FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:66f42b0e522fac4058c1e0056e89a8db18b1d28b49ce9c785f6ab68a509ec2cc
+FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:2229af4333f2ba23bdcb3b8bcd96903fb568da636519de774ee4b1fe21ea5912
 
 RUN <%= retry.loop(package_manager,
           "export DEBIAN_FRONTEND=noninteractive && \n" +

distribution/docker/src/docker/dockerfiles/wolfi/Dockerfile

@@ -25,7 +25,7 @@
 # Extract Elasticsearch artifact
 ################################################################################
 
-FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:00fa283d3647165f65fa64324d60f09d29f0ad1ade717af349131b2fc65f8f8f AS builder
+FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:e7cba125e50439f1bfd52d327dfbf10994ad8c2556265b30055d7af58c1aa600 AS builder
 
 # Install required packages to extract the Elasticsearch distribution
 RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -80,7 +80,7 @@ RUN sed -i -e 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' bin/elas
 # Add entrypoint
 ################################################################################
 
-FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:00fa283d3647165f65fa64324d60f09d29f0ad1ade717af349131b2fc65f8f8f
+FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:e7cba125e50439f1bfd52d327dfbf10994ad8c2556265b30055d7af58c1aa600
 
 RUN <%= retry.loop(package_manager,
           "export DEBIAN_FRONTEND=noninteractive && \n" +

docs/changelog/136492.yaml

@@ -0,0 +1,5 @@
+pr: 136492
+summary: Make `ResolveUnionTypes` rule stateless
+area: ES|QL
+type: bug
+issues: []

docs/reference/search-connectors/api-tutorial.md

@@ -262,7 +262,7 @@ docker run \
 --rm \
 --tty -i \
 --network host \
-docker.elastic.co/integrations/elastic-connectors:9.1.4 \
+docker.elastic.co/integrations/elastic-connectors:9.1.5 \
 /app/bin/elastic-ingest \
 -c /config/config.yml
 ```

docs/reference/search-connectors/es-connectors-azure-blob.md

@@ -189,7 +189,7 @@ docker run \
 --network "elastic" \
 --tty \
 --rm \
-docker.elastic.co/integrations/elastic-connectors:9.1.4 \
+docker.elastic.co/integrations/elastic-connectors:9.1.5 \
 /app/bin/elastic-ingest \
 -c /config/config.yml
 ```

docs/reference/search-connectors/es-connectors-box.md

@@ -237,7 +237,7 @@ docker run \
 --network "elastic" \
 --tty \
 --rm \
-docker.elastic.co/integrations/elastic-connectors:9.1.4 \
+docker.elastic.co/integrations/elastic-connectors:9.1.5 \
 /app/bin/elastic-ingest \
 -c /config/config.yml
 ```

docs/reference/search-connectors/es-connectors-confluence.md

@@ -247,7 +247,7 @@ docker run \
 --network "elastic" \
 --tty \
 --rm \
-docker.elastic.co/integrations/elastic-connectors:9.1.4 \
+docker.elastic.co/integrations/elastic-connectors:9.1.5 \
 /app/bin/elastic-ingest \
 -c /config/config.yml
 ```

docs/reference/search-connectors/es-connectors-dropbox.md

@@ -257,7 +257,7 @@ docker run \
 --network "elastic" \
 --tty \
 --rm \
-docker.elastic.co/integrations/elastic-connectors:9.1.4 \
+docker.elastic.co/integrations/elastic-connectors:9.1.5 \
 /app/bin/elastic-ingest \
 -c /config/config.yml
 ```

docs/reference/search-connectors/es-connectors-github.md

@@ -282,7 +282,7 @@ docker run \
 --network "elastic" \
 --tty \
 --rm \
-docker.elastic.co/integrations/elastic-connectors:9.1.4 \
+docker.elastic.co/integrations/elastic-connectors:9.1.5 \
 /app/bin/elastic-ingest \
 -c /config/config.yml
 ```