Merge branch 'main' into test-assertions

Author: breskeby

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

@@ -139,7 +139,7 @@ private SourceSet addSourceSet(
             compileOptions.getRelease().set(javaVersion);
         });
         if (isMainSourceSet) {
-            project.getTasks().create(sourceSet.getJavadocTaskName(), Javadoc.class, javadocTask -> {
+            project.getTasks().register(sourceSet.getJavadocTaskName(), Javadoc.class, javadocTask -> {
                 javadocTask.getJavadocTool().set(javaToolchains.javadocToolFor(spec -> {
                     spec.getLanguageVersion().set(JavaLanguageVersion.of(javaVersion));
                 }));

distribution/tools/java-version-checker/build.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'elasticsearch.build'
 
-compileJava {
+tasks.named("compileJava").configure {
   options.release = 8
 }
 

docs/changelog/123290.yaml

@@ -0,0 +1,6 @@
+pr: 123290
+summary: Fix Driver status iterations and `cpuTime`
+area: ES|QL
+type: enhancement
+issues:
+ - 122967

docs/changelog/123610.yaml

@@ -0,0 +1,5 @@
+pr: 123610
+summary: Disable concurrency when `top_hits` sorts on anything but `_score`
+area: "Aggregations"
+type: bug
+issues: []

docs/reference/community-contributed.md

@@ -42,7 +42,7 @@ a number of clients that have been contributed by the community for various lang
 
 ## Go [go]
 
-Also see the [official Elasticsearch Go client](go-elasticsearch://docs/reference/index.md).
+Also see the [official Elasticsearch Go client](go-elasticsearch://reference/index.md).
 
 * [elastigo](https://github.com/mattbaird/elastigo): Go client. **Last commit more than a year ago**
 
@@ -56,23 +56,23 @@ Also see the [official Elasticsearch Go client](go-elasticsearch://docs/referenc
 
 ## Java [java]
 
-Also see the [official Elasticsearch Java client](elasticsearch-java://docs/reference/index.md).
+Also see the [official Elasticsearch Java client](elasticsearch-java://reference/index.md).
 
 * [Flummi](https://github.com/otto-de/flummi): Java Rest client with comprehensive Query DSL API.
 
 * [Jest](https://github.com/searchbox-io/Jest): Java Rest client. **No longer maintained**
 
 ## JavaScript [javascript]
 
-See the [official Elasticsearch JavaScript client](elasticsearch-js://docs/reference/index.md).
+See the [official Elasticsearch JavaScript client](elasticsearch-js://reference/index.md).
 
 ## Julia [julia]
 
-* [ElasticsearchClient.jl](https://github.com/OpenSesame/ElasticsearchClient.jl): Elasticsearch client inspired by the [official Elasticsearch Ruby client](elasticsearch-ruby://docs/reference/index.md).
+* [ElasticsearchClient.jl](https://github.com/OpenSesame/ElasticsearchClient.jl): Elasticsearch client inspired by the [official Elasticsearch Ruby client](elasticsearch-ruby://reference/index.md).
 
 ## Kotlin [kotlin]
 
-* [ES Kotlin](https://github.com/mbuhot/eskotlin): Elasticsearch Query DSL for kotlin based on the [official Elasticsearch Java client](elasticsearch-java://docs/reference/index.md). **Last commit more than a year ago**
+* [ES Kotlin](https://github.com/mbuhot/eskotlin): Elasticsearch Query DSL for kotlin based on the [official Elasticsearch Java client](elasticsearch-java://reference/index.md). **Last commit more than a year ago**
 
 * [ES Kotlin Wrapper Client](https://github.com/jillesvangurp/es-kotlin-wrapper-client): Kotlin extension functions and abstractions for the [official Elasticsearch high-level client](https://www.elastic.co/guide/en/elasticsearch/client/java-api/current/index.html). Aims to reduce the amount of boilerplate needed to do searches, bulk indexing and other common things users do with the client. **No longer maintained**
 
@@ -82,7 +82,7 @@ See the [official Elasticsearch JavaScript client](elasticsearch-js://docs/refer
 
 ## .NET [dotnet]
 
-See the [official Elasticsearch .NET client](elasticsearch-net://docs/reference/index.md).
+See the [official Elasticsearch .NET client](elasticsearch-net://reference/index.md).
 
 ## Perl [perl]
 
@@ -92,7 +92,7 @@ Also see the [official Elasticsearch Perl client](https://www.elastic.co/guide/e
 
 ## PHP [php]
 
-Also see the [official Elasticsearch PHP client](elasticsearch-php://docs/reference/index.md).
+Also see the [official Elasticsearch PHP client](elasticsearch-php://reference/index.md).
 
 * [Elastica](https://github.com/ruflin/Elastica): PHP client.
 
@@ -102,7 +102,7 @@ Also see the [official Elasticsearch PHP client](elasticsearch-php://docs/refere
 
 ## Python [python]
 
-See the [official Elasticsearch Python client](elasticsearch-py://docs/reference/index.md).
+See the [official Elasticsearch Python client](elasticsearch-py://reference/index.md).
 
 ## R [r]
 
@@ -114,7 +114,7 @@ See the [official Elasticsearch Python client](elasticsearch-py://docs/reference
 
 ## Ruby [ruby]
 
-Also see the [official Elasticsearch Ruby client](elasticsearch-ruby://docs/reference/index.md).
+Also see the [official Elasticsearch Ruby client](elasticsearch-ruby://reference/index.md).
 
 * [chewy](https://github.com/toptal/chewy): An ODM and wrapper for the official Elasticsearch client.
 
@@ -128,7 +128,7 @@ Also see the [official Elasticsearch Ruby client](elasticsearch-ruby://docs/refe
 
 ## Rust [rust]
 
-Also see the [official Elasticsearch Rust client](elasticsearch-rs://docs/reference/index.md).
+Also see the [official Elasticsearch Rust client](elasticsearch-rs://reference/index.md).
 
 * [rs-es](https://github.com/benashford/rs-es): A REST API client with a strongly-typed Query DSL. **Last commit more than a year ago**
 

docs/reference/data-analysis/aggregations/index.md

@@ -5,13 +5,11 @@ mapped_pages:
 
 # Aggregations
 
-% What needs to be done: Refine
+:::{note}
+This section provides detailed **reference information** for aggregations.
 
-% Scope notes: need to scope the page down to just reference content
-
-% Use migrated content from existing pages that map to this page:
-
-% - [ ] ./raw-migrated-files/elasticsearch/elasticsearch-reference/search-aggregations.md
+Refer to [Aggregations](docs-content://explore-analyze/query-filter/aggregations.md) in the **Explore and analyze** section for overview, getting started and conceptual information.
+:::
 
 Aggregations are a powerful framework that enables you to perform complex data analysis and summarization over indexed documents. They enable you to extract and compute statistics, trends, and patterns from large datasets.
 

docs/reference/data-analysis/text-analysis/index.md

@@ -2,6 +2,12 @@
 
 % TO-DO: Add links to "Data analysis basics"%
 
+:::{note}
+This section provides detailed **reference information**.
+
+Refer to [the text analysis overview](docs-content://manage-data/data-store/text-analysis.md) in the **Manage data** section for overview and conceptual information.
+:::
+
 This section contains reference information for text analysis components features, including:
 
 * [Analyzers](/reference/data-analysis/text-analysis/analyzer-reference.md)

docs/reference/elasticsearch-plugins/cloud/ec-adding-elastic-plugins.md

@@ -9,7 +9,7 @@ You can use a variety of official plugins that are compatible with your version
 
 ## Before you begin [ec_before_you_begin_6]
 
-Some restrictions apply when adding plugins. To learn more, check [Restrictions for {{es}} and {{kib}} plugins](cloud://docs/release-notes/cloud-hosted/known-issues.md#ec-restrictions-plugins).
+Some restrictions apply when adding plugins. To learn more, check [Restrictions for {{es}} and {{kib}} plugins](cloud://release-notes/cloud-hosted/known-issues.md#ec-restrictions-plugins).
 
 Only Gold, Platinum, Enterprise and Private subscriptions, running version 2.4.6 or later, have access to uploading custom plugins. All subscription levels, including Standard, can upload scripts and dictionaries.
 

docs/reference/elasticsearch-plugins/cloud/ec-adding-plugins.md

@@ -24,7 +24,7 @@ To learn more about the official and community-sourced plugins, refer to [{{es}}
 
 For a detailed guide with examples of using the Elasticsearch Service API to create, get information about, update, and delete extensions and plugins, check [Managing plugins and extensions through the API](/reference/elasticsearch-plugins/cloud/ec-plugins-guide.md\).
 
-Plugins are not supported for {{kib}}. To learn more, check [Restrictions for {{es}} and {{kib}} plugins](cloud://docs/release-notes/cloud-hosted/known-issues.md#ec-restrictions-plugins).
+Plugins are not supported for {{kib}}. To learn more, check [Restrictions for {{es}} and {{kib}} plugins](cloud://release-notes/cloud-hosted/known-issues.md#ec-restrictions-plugins).
 
 
 

docs/reference/elasticsearch-plugins/integrations.md

@@ -20,10 +20,10 @@ Integrations are not plugins, but are external tools or modules that make it eas
 
 ### Supported by Elastic: [_supported_by_elastic]
 
-* [Logstash output to Elasticsearch](logstash://docs/reference/plugins-outputs-elasticsearch.md): The Logstash `elasticsearch` output plugin.
-* [Elasticsearch input to Logstash](logstash://docs/reference/plugins-inputs-elasticsearch.md) The Logstash `elasticsearch` input plugin.
-* [Elasticsearch event filtering in Logstash](logstash://docs/reference/plugins-filters-elasticsearch.md) The Logstash `elasticsearch` filter plugin.
-* [Elasticsearch bulk codec](logstash://docs/reference/plugins-codecs-es_bulk.md) The Logstash `es_bulk` plugin decodes the Elasticsearch bulk format into individual events.
+* [Logstash output to Elasticsearch](logstash://reference/plugins-outputs-elasticsearch.md): The Logstash `elasticsearch` output plugin.
+* [Elasticsearch input to Logstash](logstash://reference/plugins-inputs-elasticsearch.md) The Logstash `elasticsearch` input plugin.
+* [Elasticsearch event filtering in Logstash](logstash://reference/plugins-filters-elasticsearch.md) The Logstash `elasticsearch` filter plugin.
+* [Elasticsearch bulk codec](logstash://reference/plugins-codecs-es_bulk.md) The Logstash `es_bulk` plugin decodes the Elasticsearch bulk format into individual events.
 
 
 ### Supported by the community: [_supported_by_the_community_2]
@@ -71,7 +71,7 @@ Integrations are not plugins, but are external tools or modules that make it eas
 
 ### Supported by Elastic: [_supported_by_elastic_2]
 
-* [es-hadoop](elasticsearch-hadoop://docs/reference/preface.md): Elasticsearch real-time search and analytics natively integrated with Hadoop. Supports Map/Reduce, Cascading, Apache Hive, Apache Pig, Apache Spark and Apache Storm.
+* [es-hadoop](https://www.elastic.co/elasticsearch/hadoop): Elasticsearch real-time search and analytics natively integrated with Hadoop. Supports Map/Reduce, Cascading, Apache Hive, Apache Pig, Apache Spark and Apache Storm.
 
 
 ### Supported by the community: [_supported_by_the_community_5]