Merge branch 'main' into SEARCH-1027-linear-retriever-top-level-option-for-normalizer

Author: mridula-s109

docs/extend/creating-classic-plugins.md

@@ -136,13 +136,12 @@ org.example.module: # or 'ALL-UNNAMED' if the plugin is non-modular
 Allows code to access the filesystem, to read or write paths as specified by the entitlement's fields. The filesystem of the OS hosting {{es}} may contain sensitive files, for example credentials. Some files are meant to be always accessible to {{es}}, but plugins can not access them directly: {{es}} enforces that certain files can only be read by its core code, while some other files can not be read or written at all. A plugin is always granted `read` access to the {{es}} config directory and `read_write` access to the temp directory; if the plugin requires to read, write or access additional files or directories, it must specify them via this entitlement.
 
 It is possible to specify 3 different types of file entitlement:
-  - `path` to specify an absolute path
-  - `relative_path` to specify a relative path. The path will be resolved via the `relative_to` field, which is used to qualify the relative path. It can be a specific {{es}} directory (`config` or `data`), or to the user home directory (`home`) (the home of the user running {{es}})
-  - `relative_path` to specify a path resolved via the `relative_to` field, which can have the following values:
-    - `config`: the {{es}} [config directory](https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html#config-files-location)
-    - `data`: the {{es}} [data directory](https://www.elastic.co/guide/en/elasticsearch/reference/current/path-settings-overview.html)
-    - `home`: the home directory of the user running {{es}}
-  - `path_setting` to specify a path defined via an {{es}} setting. The path can be absolute or relative; in the latter case, the path will be resolved using the `basedir_if_relative` path (which can assume the same values as `relative_to`)
+1. `path` to specify an absolute path
+2. `relative_path` to specify a relative path. Use the `relative_to` field to qualify the relative path. `relative_to` accepts the following options:
+   - `config`: the {{es}} [config directory](https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html#config-files-location)
+   - `data`: the {{es}} [data directory](https://www.elastic.co/guide/en/elasticsearch/reference/current/path-settings-overview.html)
+   - `home`: the home directory of the user running {{es}}
+3. `path_setting` to specify a path defined via an {{es}} setting. The path can be absolute or relative; in the latter case, the path will be resolved using the `basedir_if_relative` path (which can assume the same values as `relative_to`)
 
 Each of the 3 types has some additional fields:
 - `mode` (required): can be either `read` or `read_write`

docs/release-notes/breaking-changes.md

@@ -12,23 +12,15 @@ If you are migrating from a version prior to version 9.0, you must first upgrade
 
 % ## Next version [elasticsearch-nextversion-breaking-changes]
 
-```{applies_to}
-stack: coming 9.0.3
-```
 ## 9.0.3 [elasticsearch-9.0.3-breaking-changes]
 
 No breaking changes in this version.
 
-```{applies_to}
-stack: coming 9.0.2
-```
 ## 9.0.2 [elasticsearch-9.0.2-breaking-changes]
 
 Snapshot/Restore:
 * Make S3 custom query parameter optional [#128043](https://github.com/elastic/elasticsearch/pull/128043)
 
-
-
 ## 9.0.1 [elasticsearch-9.0.1-breaking-changes]
 
 No breaking changes in this version.

docs/release-notes/changelog-bundles/9.0.2.yml

@@ -1,6 +1,6 @@
 version: 9.0.2
-released: false
-generated: 2025-05-22T15:14:00.768080Z
+released: true
+generated: 2025-06-03T14:58:36.937148609Z
 changelogs:
   - pr: 126992
     summary: Add missing `outbound_network` entitlement to x-pack-core
@@ -36,6 +36,12 @@ changelogs:
     type: bug
     issues:
       - 127468
+  - pr: 127564
+    summary: Consider inlinestats when having `field_caps` check for field names
+    area: ES|QL
+    type: bug
+    issues:
+      - 127236
   - pr: 127658
     summary: Append all data to Chat Completion buffer
     area: Machine Learning
@@ -133,3 +139,31 @@ changelogs:
     area: Data streams
     type: bug
     issues: []
+  - pr: 128259
+    summary: Added geometry validation for GEO types to exit early on invalid latitudes
+    area: Geo
+    type: bug
+    issues:
+      - 128234
+  - pr: 128260
+    summary: Fix validation NPE in Enrich and add extra @Nullable annotations
+    area: ES|QL
+    type: bug
+    issues:
+      - 126297
+      - 126253
+  - pr: 128320
+    summary: Use new source loader when lower `docId` is accessed
+    area: Codec
+    type: bug
+    issues: []
+  - pr: 128327
+    summary: Use internal user for internal inference action
+    area: Machine Learning
+    type: bug
+    issues: []
+  - pr: 128338
+    summary: Pass timeout to chat completion
+    area: Machine Learning
+    type: bug
+    issues: []

docs/release-notes/changelog-bundles/9.0.3.yml

@@ -1,6 +1,6 @@
 version: 9.0.3
-released: false
-generated: 2025-06-21T00:06:16.346021604Z
+released: true
+generated: 2025-06-24T15:19:29.859630035Z
 changelogs:
   - pr: 120869
     summary: Threadpool merge scheduler

docs/release-notes/deprecations.md

@@ -16,19 +16,11 @@ To give you insight into what deprecated features you’re using, {{es}}:
 
 % ## Next version [elasticsearch-nextversion-deprecations]
 
-```{applies_to}
-stack: coming 9.0.3
-```
 ## 9.0.3 [elasticsearch-9.0.3-deprecations]
 
 Engine:
 * Deprecate `indices.merge.scheduler.use_thread_pool` setting [#129464](https://github.com/elastic/elasticsearch/pull/129464)
 
-
-
-```{applies_to}
-stack: coming 9.0.2
-```
 ## 9.0.2 [elasticsearch-9.0.2-deprecations]
 
 No deprecations in this version.

docs/release-notes/index.md

@@ -21,9 +21,6 @@ To check for security updates, go to [Security announcements for the Elastic sta
 % *
 
 ## 9.0.3 [elasticsearch-9.0.3-release-notes]
-```{applies_to}
-stack: coming 9.0.3
-```
 
 ### Features and enhancements [elasticsearch-9.0.3-features-enhancements]
 
@@ -92,11 +89,7 @@ Searchable Snapshots:
 Security:
 * Fix error message when changing the password for a user in the file realm [#127621](https://github.com/elastic/elasticsearch/pull/127621)
 
-
 ## 9.0.2 [elasticsearch-9.0.2-release-notes]
-```{applies_to}
-stack: coming 9.0.2
-```
 
 ### Features and enhancements [elasticsearch-9.0.2-features-enhancements]
 
@@ -114,19 +107,27 @@ Aggregations:
 Audit:
 * Handle streaming request body in audit log [#127798](https://github.com/elastic/elasticsearch/pull/127798)
 
+Codec:
+* Use new source loader when lower `docId` is accessed [#128320](https://github.com/elastic/elasticsearch/pull/128320)
+
 Data streams:
 * Fix system data streams incorrectly showing up in the list of template validation problems [#128161](https://github.com/elastic/elasticsearch/pull/128161)
 
 Downsampling:
 * Downsampling does not consider passthrough fields as dimensions [#127752](https://github.com/elastic/elasticsearch/pull/127752) (issue: [#125156](https://github.com/elastic/elasticsearch/issues/125156))
 
 ES|QL:
+* Consider inlinestats when having `field_caps` check for field names [#127564](https://github.com/elastic/elasticsearch/pull/127564) (issue: [#127236](https://github.com/elastic/elasticsearch/issues/127236))
 * Don't push down filters on the right hand side of an inlinejoin [#127383](https://github.com/elastic/elasticsearch/pull/127383)
 * ESQL: Avoid unintended attribute removal [#127563](https://github.com/elastic/elasticsearch/pull/127563) (issue: [#127468](https://github.com/elastic/elasticsearch/issues/127468))
 * ESQL: Fix alias removal in regex extraction with JOIN [#127687](https://github.com/elastic/elasticsearch/pull/127687) (issue: [#127467](https://github.com/elastic/elasticsearch/issues/127467))
 * ESQL: Keep `DROP` attributes when resolving field names [#127009](https://github.com/elastic/elasticsearch/pull/127009) (issue: [#126418](https://github.com/elastic/elasticsearch/issues/126418))
 * Ensure ordinal builder emit ordinal blocks [#127949](https://github.com/elastic/elasticsearch/pull/127949)
 * Fix union types in CCS [#128111](https://github.com/elastic/elasticsearch/pull/128111)
+* Fix validation NPE in Enrich and add extra @Nullable annotations [#128260](https://github.com/elastic/elasticsearch/pull/128260) (issues: [#126297](https://github.com/elastic/elasticsearch/issues/126297), [#126253](https://github.com/elastic/elasticsearch/issues/126253))
+
+Geo:
+* Added geometry validation for GEO types to exit early on invalid latitudes [#128259](https://github.com/elastic/elasticsearch/pull/128259) (issue: [#128234](https://github.com/elastic/elasticsearch/issues/128234))
 
 Infra/Core:
 * Add missing `outbound_network` entitlement to x-pack-core [#126992](https://github.com/elastic/elasticsearch/pull/126992) (issue: [#127003](https://github.com/elastic/elasticsearch/issues/127003))
@@ -138,6 +139,8 @@ Infra/Scripting:
 Machine Learning:
 * Append all data to Chat Completion buffer [#127658](https://github.com/elastic/elasticsearch/pull/127658)
 * Fix services API Google Vertex AI Rerank location field requirement [#127856](https://github.com/elastic/elasticsearch/pull/127856)
+* Pass timeout to chat completion [#128338](https://github.com/elastic/elasticsearch/pull/128338)
+* Use internal user for internal inference action [#128327](https://github.com/elastic/elasticsearch/pull/128327)
 
 Relevance:
 * Fix: Add `NamedWriteable` for `RuleQueryRankDoc` [#128153](https://github.com/elastic/elasticsearch/pull/128153) (issue: [#126071](https://github.com/elastic/elasticsearch/issues/126071))

libs/core/src/main/java/org/elasticsearch/core/NotMultiProjectCapable.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch.core;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation to identify a block of code (a whole class, a method, a field, or a local variable) that is intentionally not fully
+ * project-aware because it's not intended to be used in a serverless environment. Some features are unavailable in serverless and are
+ * thus not worth the investment to make fully project-aware. This annotation makes it easier to identify blocks of code that require
+ * attention in case those features are revisited from a multi-project POV.
+ */
+@Retention(RetentionPolicy.SOURCE)
+@Target(
+    { ElementType.LOCAL_VARIABLE, ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.METHOD, ElementType.TYPE, ElementType.MODULE }
+)
+public @interface NotMultiProjectCapable {
+
+    /**
+     * Some explanation on why the block of code would not work in a multi-project context and/or what would need to be done to make it
+     * properly project-aware.
+     */
+    String description() default "";
+}