Skip to content

Commit b0ec173

Browse files
committed
Merge remote-tracking branch 'elastic/main' into retry-shard-failures
2 parents b552c0d + 1e12b54 commit b0ec173

File tree

541 files changed

+11497
-6605
lines changed

Some content is hidden

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

541 files changed

+11497
-6605
lines changed

.buildkite/pipelines/periodic.template.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ steps:
8686
ES_RUNTIME_JAVA:
8787
- openjdk21
8888
- openjdk23
89+
- openjdk24
8990
GRADLE_TASK:
9091
- checkPart1
9192
- checkPart2

.buildkite/pipelines/periodic.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,7 @@ steps:
505505
ES_RUNTIME_JAVA:
506506
- openjdk21
507507
- openjdk23
508+
- openjdk24
508509
GRADLE_TASK:
509510
- checkPart1
510511
- checkPart2

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ private void addJar(Project project, SourceSet sourceSet, int javaVersion) {
163163
project.getConfigurations().register("java" + javaVersion);
164164
TaskProvider<Jar> jarTask = project.getTasks().register("java" + javaVersion + "Jar", Jar.class, task -> {
165165
task.from(sourceSet.getOutput());
166+
task.getArchiveClassifier().set("java" + javaVersion);
166167
});
167168
project.getArtifacts().add("java" + javaVersion, jarTask);
168169
}

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
import static org.gradle.api.JavaVersion.VERSION_21;
6161
import static org.gradle.api.JavaVersion.VERSION_22;
6262
import static org.gradle.api.JavaVersion.VERSION_23;
63+
import static org.gradle.api.JavaVersion.VERSION_24;
6364

6465
@CacheableTask
6566
public abstract class ThirdPartyAuditTask extends DefaultTask {
@@ -341,8 +342,12 @@ private String runForbiddenAPIsCli() throws IOException {
341342
spec.setExecutable(javaHome.get() + "/bin/java");
342343
}
343344
spec.classpath(getForbiddenAPIsClasspath(), getThirdPartyClasspath());
344-
// Enable explicitly for each release as appropriate. Just JDK 20/21/22/23 for now, and just the vector module.
345-
if (isJavaVersion(VERSION_20) || isJavaVersion(VERSION_21) || isJavaVersion(VERSION_22) || isJavaVersion(VERSION_23)) {
345+
// Enable explicitly for each release as appropriate. Just JDK 20/21/22/23/24 for now, and just the vector module.
346+
if (isJavaVersion(VERSION_20)
347+
|| isJavaVersion(VERSION_21)
348+
|| isJavaVersion(VERSION_22)
349+
|| isJavaVersion(VERSION_23)
350+
|| isJavaVersion(VERSION_24)) {
346351
spec.jvmArgs("--add-modules", "jdk.incubator.vector");
347352
}
348353
spec.jvmArgs("-Xmx1g");

docs/changelog/119546.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 119546
2+
summary: Introduce `FallbackSyntheticSourceBlockLoader` and apply it to keyword fields
3+
area: Mapping
4+
type: enhancement
5+
issues: []

docs/changelog/120751.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 120751
2+
summary: Adding support for binary embedding type to Cohere service embedding type
3+
area: Machine Learning
4+
type: enhancement
5+
issues: []

docs/changelog/120807.yaml

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

docs/changelog/120852.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 120852
2+
summary: Correct line and column numbers of missing named parameters
3+
area: ES|QL
4+
type: bug
5+
issues: []

docs/changelog/120957.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 120957
2+
summary: Introduce `AllocationBalancingRoundSummaryService`
3+
area: Allocation
4+
type: enhancement
5+
issues: []

docs/changelog/121240.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 121240
2+
summary: Implement runtime skip_unavailable=true
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

0 commit comments

Comments
 (0)