Skip to content

Commit cde5272

Browse files
author
elasticsearchmachine
committed
Merge remote-tracking branch 'origin/main' into lucene_snapshot
2 parents 30b2a02 + f1de84b commit cde5272

File tree

252 files changed

+3729
-2181
lines changed

Some content is hidden

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

252 files changed

+3729
-2181
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ gradle @elastic/es-delivery
3939
build-conventions @elastic/es-delivery
4040
build-tools @elastic/es-delivery
4141
build-tools-internal @elastic/es-delivery
42-
*.gradle @elastic/es-delivery
4342
.buildkite @elastic/es-delivery
4443
.ci @elastic/es-delivery
4544
.idea @elastic/es-delivery

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ public enum DockerBase {
2121
// The Iron Bank base image is UBI (albeit hardened), but we are required to parameterize the Docker build
2222
IRON_BANK("${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}", "-ironbank", "yum"),
2323

24-
// Base image with extras for Cloud
25-
CLOUD("ubuntu:20.04", "-cloud", "apt-get"),
26-
2724
// Chainguard based wolfi image with latest jdk
2825
// This is usually updated via renovatebot
2926
// spotless:off

distribution/docker/build.gradle

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -288,20 +288,6 @@ void addBuildDockerContextTask(Architecture architecture, DockerBase base) {
288288
}
289289
}
290290

291-
if (base == DockerBase.CLOUD) {
292-
// If we're performing a release build, but `build.id` hasn't been set, we can
293-
// infer that we're not at the Docker building stage of the build, and therefore
294-
// we should skip the beats part of the build.
295-
String buildId = providers.systemProperty('build.id').getOrNull()
296-
boolean includeBeats = VersionProperties.isElasticsearchSnapshot() == true || buildId != null || useDra
297-
298-
if (includeBeats) {
299-
from configurations.getByName("filebeat_${architecture.classifier}")
300-
from configurations.getByName("metricbeat_${architecture.classifier}")
301-
}
302-
// For some reason, the artifact name can differ depending on what repository we used.
303-
rename ~/((?:file|metric)beat)-.*\.tar\.gz$/, "\$1-${VersionProperties.elasticsearch}.tar.gz"
304-
}
305291
Provider<DockerSupportService> serviceProvider = GradleUtils.getBuildService(
306292
project.gradle.sharedServices,
307293
DockerSupportPlugin.DOCKER_SUPPORT_SERVICE_NAME
@@ -381,7 +367,7 @@ private static List<String> generateTags(DockerBase base, Architecture architect
381367
String image = "elasticsearch${base.suffix}"
382368

383369
String namespace = 'elasticsearch'
384-
if (base == DockerBase.CLOUD || base == DockerBase.CLOUD_ESS) {
370+
if (base == base == DockerBase.CLOUD_ESS) {
385371
namespace += '-ci'
386372
}
387373

@@ -439,7 +425,7 @@ void addBuildDockerImageTask(Architecture architecture, DockerBase base) {
439425

440426
}
441427

442-
if (base != DockerBase.IRON_BANK && base != DockerBase.CLOUD && base != DockerBase.CLOUD_ESS) {
428+
if (base != DockerBase.IRON_BANK && base != DockerBase.CLOUD_ESS) {
443429
tasks.named("assemble").configure {
444430
dependsOn(buildDockerImageTask)
445431
}
@@ -548,21 +534,16 @@ subprojects { Project subProject ->
548534
base = DockerBase.IRON_BANK
549535
} else if (subProject.name.contains('cloud-ess-')) {
550536
base = DockerBase.CLOUD_ESS
551-
} else if (subProject.name.contains('cloud-')) {
552-
base = DockerBase.CLOUD
553-
} else if (subProject.name.contains('wolfi-ess')) {
554-
base = DockerBase.WOLFI_ESS
555537
} else if (subProject.name.contains('wolfi-')) {
556538
base = DockerBase.WOLFI
557539
}
558540

559541
final String arch = architecture == Architecture.AARCH64 ? '-aarch64' : ''
560542
final String extension = base == DockerBase.UBI ? 'ubi.tar' :
561543
(base == DockerBase.IRON_BANK ? 'ironbank.tar' :
562-
(base == DockerBase.CLOUD ? 'cloud.tar' :
563544
(base == DockerBase.CLOUD_ESS ? 'cloud-ess.tar' :
564545
(base == DockerBase.WOLFI ? 'wolfi.tar' :
565-
'docker.tar'))))
546+
'docker.tar')))
566547
final String artifactName = "elasticsearch${arch}${base.suffix}_test"
567548

568549
final String exportTaskName = taskName("export", architecture, base, 'DockerImage')

distribution/docker/cloud-docker-aarch64-export/build.gradle

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

distribution/docker/cloud-docker-export/build.gradle

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

distribution/docker/wolfi-ess-docker-aarch64-export/build.gradle

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

distribution/docker/wolfi-ess-docker-export/build.gradle

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

docs/changelog/113975.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
pr: 113975
2+
summary: JDK locale database change
3+
area: Mapping
4+
type: breaking
5+
issues: []
6+
breaking:
7+
title: JDK locale database change
8+
area: Mapping
9+
details: |
10+
{es} 8.16 changes the version of the JDK that is included from version 22 to version 23. This changes the locale database that is used by Elasticsearch from the COMPAT database to the CLDR database. This change can cause significant differences to the textual date formats accepted by Elasticsearch, and to calculated week-dates.
11+
12+
If you run {es} 8.16 on JDK version 22 or below, it will use the COMPAT locale database to match the behavior of 8.15. However, starting with {es} 9.0, {es} will use the CLDR database regardless of JDK version it is run on.
13+
impact: |
14+
This affects you if you use custom date formats using textual or week-date field specifiers. If you use date fields or calculated week-dates that change between the COMPAT and CLDR databases, then this change will cause Elasticsearch to reject previously valid date fields as invalid data. You might need to modify your ingest or output integration code to account for the differences between these two JDK versions.
15+
16+
Starting in version 8.15.2, Elasticsearch will log deprecation warnings if you are using date format specifiers that might change on upgrading to JDK 23. These warnings are visible in Kibana.
17+
18+
For detailed guidance, refer to <<custom-date-format-locales,Differences in locale information between JDK versions>> and the https://ela.st/jdk-23-locales[Elastic blog].
19+
notable: true

docs/changelog/114334.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
pr: 114334
2+
summary: Don't return TEXT type for functions that take TEXT
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 111537
7+
- 114333

docs/changelog/114665.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 114665
2+
summary: Fixing remote ENRICH by pushing the Enrich inside `FragmentExec`
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 105095

0 commit comments

Comments
 (0)