Skip to content

Commit 5e2edc4

Browse files
authored
Merge branch 'main' into 2025/02/04/v9-transport-handshakes
2 parents 3056415 + e5ea00a commit 5e2edc4

File tree

108 files changed

+2282
-740
lines changed

Some content is hidden

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

108 files changed

+2282
-740
lines changed

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/reference/esql/functions/kibana/definition/kql.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/esql/functions/kibana/definition/match.json

Lines changed: 59 additions & 59 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/esql/functions/kibana/definition/match_operator.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/esql/functions/kibana/definition/qstr.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/esql/functions/kibana/docs/kql.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/esql/functions/kibana/docs/match.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/esql/functions/kibana/docs/match_operator.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)