Merge branch 'main' into add_min_score_linear_retriever

Author: mridula-s109

build-tools-internal/version.properties

@@ -1,5 +1,5 @@
 elasticsearch     = 9.1.0
-lucene            = 10.2.1-snapshot-ae6484f43e6
+lucene            = 10.2.1
 
 bundled_jdk_vendor = openjdk
 bundled_jdk = 24+36@1f9ff9062db4449d8ca828c504ffae90

docs/changelog/126401.yaml

@@ -0,0 +1,5 @@
+pr: 126401
+summary: Add pinned retriever
+area: Relevance
+type: enhancement
+issues: []

docs/changelog/126856.yaml

@@ -0,0 +1,5 @@
+pr: 126856
+summary: "[ML] Integrate SageMaker with OpenAI Embeddings"
+area: Machine Learning
+type: enhancement
+issues: []

docs/changelog/127330.yaml

@@ -0,0 +1,5 @@
+pr: 127330
+summary: Move unpromotable relocations to its own transport action
+area: Recovery
+type: enhancement
+issues: []

docs/changelog/127343.yaml

@@ -0,0 +1,5 @@
+pr: 127343
+summary: Upgrade to Lucene 10.2.1
+area: Search
+type: upgrade
+issues: []

docs/changelog/127475.yaml

@@ -0,0 +1,5 @@
+pr: 127475
+summary: Remove dangling spaces wherever found
+area: Security
+type: bug
+issues: []

gradle/verification-metadata.xml

@@ -333,8 +333,11 @@ private void throwExpectedStartObject(XContentParser parser, XContentParser.Toke
 
     private static void throwMissingRequiredFields(List<String[]> requiredFields) {
         final StringBuilder message = new StringBuilder();
-        for (String[] fields : requiredFields) {
-            message.append("Required one of fields ").append(Arrays.toString(fields)).append(", but none were specified. ");
+        for (int i = 0; i < requiredFields.size(); i++) {
+            if (i > 0) {
+                message.append(" ");
+            }
+            message.append("Required one of fields ").append(Arrays.toString(requiredFields.get(i))).append(", but none were specified.");
         }
         throw new IllegalArgumentException(message.toString());
     }

libs/x-content/src/main/java/org/elasticsearch/xcontent/ObjectParser.java

@@ -1004,7 +1004,7 @@ public void testMultipleRequiredFieldSet() throws IOException {
         IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> objectParser.apply(parser, null));
         assertThat(
             e.getMessage(),
-            equalTo("Required one of fields [a, b], but none were specified. " + "Required one of fields [c, d], but none were specified. ")
+            equalTo("Required one of fields [a, b], but none were specified. " + "Required one of fields [c, d], but none were specified.")
         );
     }
 

libs/x-content/src/test/java/org/elasticsearch/xcontent/ObjectParserTests.java

@@ -399,9 +399,6 @@ tests:
 - class: org.elasticsearch.packaging.test.DockerTests
   method: test024InstallPluginFromArchiveUsingConfigFile
   issue: https://github.com/elastic/elasticsearch/issues/126936
-- class: org.elasticsearch.search.aggregations.bucket.FiltersIT
-  method: testSimpleWithFilterQuery
-  issue: https://github.com/elastic/elasticsearch/issues/127099
 - class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
   method: test {rerank.Reranker before a limit ASYNC}
   issue: https://github.com/elastic/elasticsearch/issues/127051
@@ -432,9 +429,6 @@ tests:
 - class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeIT
   method: test
   issue: https://github.com/elastic/elasticsearch/issues/127536
-- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
-  method: test {union_types.MultiIndexSortIpStringEval ASYNC}
-  issue: https://github.com/elastic/elasticsearch/issues/127537
 - class: org.elasticsearch.xpack.inference.action.filter.ShardBulkInferenceActionFilterIT
   method: testRestart {p0=false p1=false}
   issue: https://github.com/elastic/elasticsearch/issues/127592
@@ -447,6 +441,9 @@ tests:
 - class: org.elasticsearch.xpack.inference.action.filter.ShardBulkInferenceActionFilterIT
   method: testRestart {p0=true p1=true}
   issue: https://github.com/elastic/elasticsearch/issues/127595
+- class: org.elasticsearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT
+  method: testRestoreSnapshotAllocationDoesNotExceedWatermarkWithMultipleRestores
+  issue: https://github.com/elastic/elasticsearch/issues/127286
 
 # Examples:
 #