Merge branch 'main' into entitlements/security_policy

Author: rjernst

.editorconfig

@@ -209,9 +209,7 @@ indent_size = 4
 max_line_length = 140
 ij_java_class_count_to_use_import_on_demand = 999
 ij_java_names_count_to_use_import_on_demand = 999
-# The first '@*,' is a workaround for https://youtrack.jetbrains.com/issue/IDEA-368382/Auto-import-puts-java-imports-first-even-when-Editor-Code-style-Java-Import-layout-puts-them-last
-# it should be removed once that is fixed
-ij_java_imports_layout = @*,*,|,com.**,|,org.**,|,java.**,|,javax.**,|,$*
+ij_java_imports_layout = *,|,com.**,|,org.**,|,java.**,|,javax.**,|,$*
 
 [*.json]
 indent_size = 2

build-tools-internal/build.gradle

@@ -282,8 +282,6 @@ dependencies {
   api "org.elasticsearch:build-conventions:$version"
   api "org.elasticsearch.gradle:build-tools:$version"
 
-  // same version as http client transitive dep
-  api buildLibs.commons.codec
   api buildLibs.apache.compress
   api buildLibs.nebula.info
   api buildLibs.apache.rat
@@ -303,8 +301,8 @@ dependencies {
   api buildLibs.antlrst4
   api buildLibs.asm
   api buildLibs.asm.tree
-  api buildLibs.httpclient
-  api buildLibs.httpcore
+  api buildLibs.httpclient5
+  api buildLibs.httpcore5
 
   compileOnly buildLibs.checkstyle
   compileOnly buildLibs.reflections

build-tools-internal/settings.gradle

@@ -5,7 +5,7 @@ pluginManagement {
   }
 
   includeBuild "../build-conventions"
-    includeBuild "../build-tools"
+  includeBuild "../build-tools"
 }
 
 plugins {

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

@@ -9,12 +9,14 @@
 
 package org.elasticsearch.gradle.internal.snyk;
 
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.entity.FileEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
+import org.apache.hc.client5.http.classic.methods.HttpPut;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.ParseException;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.http.io.entity.FileEntity;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
 import org.gradle.api.file.RegularFileProperty;
@@ -61,16 +63,16 @@ void upload() {
             HttpPut putRequest = new HttpPut(endpoint);
             putRequest.addHeader("Authorization", "token " + token.get());
             putRequest.addHeader("Content-Type", "application/json");
-            putRequest.setEntity(new FileEntity(inputFile.getAsFile().get()));
+            putRequest.setEntity(new FileEntity(inputFile.getAsFile().get(), ContentType.APPLICATION_JSON));
             response = client.execute(putRequest);
-            int statusCode = response.getStatusLine().getStatusCode();
+            int statusCode = response.getCode();
             String responseString = EntityUtils.toString(response.getEntity());
             getLogger().info("Snyk API call response status: " + statusCode);
             if (statusCode != HttpURLConnection.HTTP_CREATED) {
                 throw new GradleException("Uploading Snyk Graph failed with http code " + statusCode + ": " + responseString);
             }
             getLogger().info(responseString);
-        } catch (IOException e) {
+        } catch (IOException | ParseException e) {
             throw new GradleException("Failed to call API endpoint to submit updated dependency graph", e);
         }
     }

distribution/build.gradle

@@ -274,7 +274,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
     }
     all {
       resolutionStrategy.dependencySubstitution {
-        substitute module("org.apache.logging.log4j:log4j-core") using project(":libs:log4j") because "patched to remove JndiLookup clas"}
+        substitute module("org.apache.logging.log4j:log4j-core") using project(":libs:log4j") because "patched to remove JndiLookup class"}
     }
   }
 

docs/README.md

@@ -49,14 +49,14 @@ To re-run CI checks, an Elastic employee can select the `Re-run this job` option
 
 > [!TIP]
 As of 9.0.0, we are currently only publishing from the `main` branch.
-**This means that backporting is currently not necessary for 9.0+ Elasticsearch docs.**
+We will continue to backport changes as usual, in case we need to revisit this approach in the future.
 
-However, if you need to update the `8.x` docs, you'll have to use the old `asciidoc` system. Refer to the [`8.x` README](https://github.com/elastic/elasticsearch/blob/8.x/docs/README.asciidoc) for more information.
+If you need to update the `8.x` docs, you'll have to use the old `asciidoc` system. Refer to the [`8.x` README](https://github.com/elastic/elasticsearch/blob/8.x/docs/README.asciidoc) for more information.
 
 > [!NOTE]
 > If you need to make changes to 9.x docs and 8.x docs, you'll need to use two different workflows:
 
-- **For `9.x` docs**, create a PR using the new Markdown system against the `main` branch.
+- **For `9.x` docs**, create a PR using the new Markdown system against the `main` branch and backport as necessary.
 - **For `8.x` docs**, create a PR using the old AsciiDoc system against the `8.x` branch and backport the changes to any other `8.x` branches needed.
 
 ## Test code snippets

docs/changelog/121787.yaml

@@ -0,0 +1,6 @@
+pr: 121787
+summary: Added optional parameters to QSTR ES|QL function
+area: Search
+type: feature
+issues:
+ - 120933

docs/changelog/122606.yaml

@@ -0,0 +1,5 @@
+pr: 122606
+summary: Avoid serializing empty `_source` fields in mappings
+area: Mapping
+type: bug
+issues: []

docs/changelog/123543.yaml

@@ -0,0 +1,6 @@
+pr: 123543
+summary: Enhance memory accounting for document expansion and introduce max document
+  size limit
+area: CRUD
+type: enhancement
+issues: []

docs/changelog/123589.yaml

@@ -0,0 +1,5 @@
+pr: 123589
+summary: Revive some more of inlinestats functionality
+area: ES|QL
+type: bug
+issues: []