Skip to content

Commit fcab26f

Browse files
authored
Merge branch 'main' into rework-transitive-deps-handling
2 parents c9a56b5 + fd0992b commit fcab26f

File tree

722 files changed

+21648
-15037
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

722 files changed

+21648
-15037
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
package org.elasticsearch.gradle.internal.transport;
1111

1212
import org.elasticsearch.gradle.internal.ProjectSubscribeServicePlugin;
13+
import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin;
14+
import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitTaskPlugin;
1315
import org.elasticsearch.gradle.util.GradleUtils;
1416
import org.gradle.api.Plugin;
1517
import org.gradle.api.Project;
@@ -23,6 +25,7 @@ public class TransportVersionReferencesPlugin implements Plugin<Project> {
2325
@Override
2426
public void apply(Project project) {
2527
project.getPluginManager().apply(LifecycleBasePlugin.class);
28+
project.getPluginManager().apply(PrecommitTaskPlugin.class);
2629

2730
project.getPlugins()
2831
.apply(ProjectSubscribeServicePlugin.class)
@@ -50,6 +53,6 @@ public void apply(Project project) {
5053
t.setDescription("Validates that all TransportVersion references used in the project have an associated definition file");
5154
t.getReferencesFile().set(collectTask.get().getOutputFile());
5255
});
53-
project.getTasks().named(LifecycleBasePlugin.CHECK_TASK_NAME).configure(t -> t.dependsOn(validateTask));
56+
project.getTasks().named(PrecommitPlugin.PRECOMMIT_TASK_NAME).configure(t -> t.dependsOn(validateTask));
5457
}
5558
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import org.elasticsearch.gradle.Version;
1313
import org.elasticsearch.gradle.internal.ProjectSubscribeServicePlugin;
1414
import org.elasticsearch.gradle.internal.conventions.VersionPropertiesPlugin;
15+
import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin;
16+
import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitTaskPlugin;
1517
import org.gradle.api.Plugin;
1618
import org.gradle.api.Project;
1719
import org.gradle.api.file.Directory;
@@ -30,6 +32,7 @@ public class TransportVersionResourcesPlugin implements Plugin<Project> {
3032
public void apply(Project project) {
3133
project.getPluginManager().apply(LifecycleBasePlugin.class);
3234
project.getPluginManager().apply(VersionPropertiesPlugin.class);
35+
project.getPluginManager().apply(PrecommitTaskPlugin.class);
3336
var psService = project.getPlugins().apply(ProjectSubscribeServicePlugin.class).getService();
3437

3538
Properties versions = (Properties) project.getExtensions().getByName(VersionPropertiesPlugin.VERSIONS_EXT);
@@ -67,7 +70,7 @@ public void apply(Project project) {
6770
t.getShouldValidateDensity().convention(true);
6871
t.getShouldValidatePrimaryIdNotPatch().convention(true);
6972
});
70-
project.getTasks().named(LifecycleBasePlugin.CHECK_TASK_NAME).configure(t -> t.dependsOn(validateTask));
73+
project.getTasks().named(PrecommitPlugin.PRECOMMIT_TASK_NAME).configure(t -> t.dependsOn(validateTask));
7174

7275
var generateManifestTask = project.getTasks()
7376
.register("generateTransportVersionManifest", GenerateTransportVersionManifestTask.class, t -> {

docs/changelog/131111.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

docs/changelog/132243.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 132243
2+
summary: Fix `NullPointerException` in transport trace logger
3+
area: Network
4+
type: bug
5+
issues: []

docs/changelog/133360.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 133360
2+
summary: Add recover_failure_document processor to remediate failurestore docs
3+
area: Ingest Node
4+
type: feature
5+
issues: []

docs/changelog/133446.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

docs/changelog/133860.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 133860
2+
summary: Cache Inference Endpoints
3+
area: Machine Learning
4+
type: enhancement
5+
issues:
6+
- 133135

docs/changelog/134134.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 134134
2+
summary: Prevent field caps from failing due to can match failure
3+
area: Search
4+
type: bug
5+
issues:
6+
- 116106

docs/changelog/134253.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 134253
2+
summary: Fixed a bug where text fields in LogsDB indices did not use their keyword multi fields for block loading
3+
area: Mapping
4+
type: bug
5+
issues: []

docs/changelog/134451.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 134451
2+
summary: Use inner query for equals/hashCode() in `SourceConfirmedTextQuery`
3+
area: "Search"
4+
type: bug
5+
issues:
6+
- 134432

0 commit comments

Comments
 (0)