From 2eaa25cdde3afd6749e0914f7cba421d36eaaa13 Mon Sep 17 00:00:00 2001 From: ChrisHegarty Date: Tue, 27 Aug 2024 21:07:59 +0100 Subject: [PATCH 1/5] Prepare for JDK 21 --- .../src/main/resources/minimumCompilerVersion | 2 +- .../src/main/resources/minimumRuntimeVersion | 2 +- gradle/verification-metadata.xml | 5 +++++ .../allocation/TransportGetAllocationStatsAction.java | 1 + .../admin/indices/resolve/ResolveClusterActionRequest.java | 2 ++ .../elasticsearch/action/delete/DeleteRequestBuilder.java | 1 + .../org/elasticsearch/action/index/IndexRequestBuilder.java | 1 + .../elasticsearch/action/update/UpdateRequestBuilder.java | 1 + .../client/internal/support/AbstractClient.java | 1 + .../java/org/elasticsearch/index/codec/CodecService.java | 1 + .../main/java/org/elasticsearch/index/mapper/Mapper.java | 2 ++ .../index/reindex/DeleteByQueryRequestBuilder.java | 1 + .../search/aggregations/metrics/InternalStats.java | 1 + .../search/rank/feature/RankFeatureResult.java | 2 ++ .../composite/CompositeValuesCollectorQueueTests.java | 2 +- test/logger-usage/build.gradle | 6 +++--- .../blobcache/shared/SharedBlobCacheServiceTests.java | 2 +- .../xpack/core/template/YamlTemplateRegistry.java | 2 +- .../org/elasticsearch/compute/gen/AggregatorProcessor.java | 2 +- .../org/elasticsearch/compute/gen/ConsumeProcessor.java | 2 +- .../org/elasticsearch/compute/gen/EvaluatorProcessor.java | 2 +- .../esql/expression/function/EsqlFunctionRegistry.java | 1 + 22 files changed, 31 insertions(+), 11 deletions(-) diff --git a/build-tools-internal/src/main/resources/minimumCompilerVersion b/build-tools-internal/src/main/resources/minimumCompilerVersion index 98d9bcb75a685..aabe6ec3909c9 100644 --- a/build-tools-internal/src/main/resources/minimumCompilerVersion +++ b/build-tools-internal/src/main/resources/minimumCompilerVersion @@ -1 +1 @@ -17 +21 diff --git a/build-tools-internal/src/main/resources/minimumRuntimeVersion b/build-tools-internal/src/main/resources/minimumRuntimeVersion index 98d9bcb75a685..aabe6ec3909c9 100644 --- a/build-tools-internal/src/main/resources/minimumRuntimeVersion +++ b/build-tools-internal/src/main/resources/minimumRuntimeVersion @@ -1 +1 @@ -17 +21 diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 1001ab2b709dd..261e210cdbe11 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -4204,6 +4204,11 @@ + + + + + diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java index bec131341a8f4..2f094b0fc6006 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java @@ -108,6 +108,7 @@ public static class Request extends MasterNodeReadRequest { private final EnumSet metrics; + @SuppressWarnings("this-escape") public Request(TimeValue masterNodeTimeout, TaskId parentTaskId, EnumSet metrics) { super(masterNodeTimeout); setParentTask(parentTaskId); diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterActionRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterActionRequest.java index 118f139045971..224ea63150420 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterActionRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterActionRequest.java @@ -54,12 +54,14 @@ public ResolveClusterActionRequest(String[] names) { this(names, DEFAULT_INDICES_OPTIONS); } + @SuppressWarnings("this-escape") public ResolveClusterActionRequest(String[] names, IndicesOptions indicesOptions) { this.names = names; this.localIndicesRequested = localIndicesPresent(names); this.indicesOptions = indicesOptions; } + @SuppressWarnings("this-escape") public ResolveClusterActionRequest(StreamInput in) throws IOException { super(in); if (in.getTransportVersion().before(TransportVersions.V_8_13_0)) { diff --git a/server/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java index f2b1dc7cd556c..40810f004b0de 100644 --- a/server/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java @@ -30,6 +30,7 @@ public class DeleteRequestBuilder extends ReplicationRequestBuilder pos) { CompositeKey key = queue.toCompositeKey(queue.pop()); diff --git a/test/logger-usage/build.gradle b/test/logger-usage/build.gradle index 4404fb6fd11b0..31b02eed31e11 100644 --- a/test/logger-usage/build.gradle +++ b/test/logger-usage/build.gradle @@ -9,9 +9,9 @@ apply plugin: 'elasticsearch.java' dependencies { - api 'org.ow2.asm:asm:9.2' - api 'org.ow2.asm:asm-tree:9.2' - api 'org.ow2.asm:asm-analysis:9.2' + api 'org.ow2.asm:asm:9.7' + api 'org.ow2.asm:asm-tree:9.7' + api 'org.ow2.asm:asm-analysis:9.7' api "org.apache.logging.log4j:log4j-api:${versions.log4j}" testImplementation project(":test:framework") } diff --git a/x-pack/plugin/blob-cache/src/test/java/org/elasticsearch/blobcache/shared/SharedBlobCacheServiceTests.java b/x-pack/plugin/blob-cache/src/test/java/org/elasticsearch/blobcache/shared/SharedBlobCacheServiceTests.java index 346950d385a40..597180a1d1c31 100644 --- a/x-pack/plugin/blob-cache/src/test/java/org/elasticsearch/blobcache/shared/SharedBlobCacheServiceTests.java +++ b/x-pack/plugin/blob-cache/src/test/java/org/elasticsearch/blobcache/shared/SharedBlobCacheServiceTests.java @@ -1408,7 +1408,7 @@ protected int computeCacheFileRegionSize(long fileLength, int region) { final var blobLength = randomLongBetween(1L, cacheSize); int regions = Math.toIntExact(blobLength / regionSize); - regions += (blobLength % regionSize == 0L ? 0L : 1L); + regions += (blobLength % regionSize == 0 ? 0 : 1); assertThat( cacheService.computeCacheFileRegionSize(blobLength, randomFrom(regions)), equalTo(BlobCacheUtils.toIntBytes(regionSize)) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/YamlTemplateRegistry.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/YamlTemplateRegistry.java index 7471f722261bf..a4e5d7cdc4b44 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/YamlTemplateRegistry.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/YamlTemplateRegistry.java @@ -50,7 +50,7 @@ public abstract class YamlTemplateRegistry extends IndexTemplateRegistry { private final FeatureService featureService; private volatile boolean enabled; - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "this-escape" }) public YamlTemplateRegistry( Settings nodeSettings, ClusterService clusterService, diff --git a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorProcessor.java b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorProcessor.java index 4b1f946a1d176..863db86eb934a 100644 --- a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorProcessor.java +++ b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorProcessor.java @@ -52,7 +52,7 @@ public Set getSupportedAnnotationTypes() { @Override public SourceVersion getSupportedSourceVersion() { - return SourceVersion.RELEASE_17; + return SourceVersion.RELEASE_21; } @Override diff --git a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/ConsumeProcessor.java b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/ConsumeProcessor.java index b76b1cc7ea74b..b4e74d52ffeb8 100644 --- a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/ConsumeProcessor.java +++ b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/ConsumeProcessor.java @@ -48,7 +48,7 @@ public Set getSupportedAnnotationTypes() { @Override public SourceVersion getSupportedSourceVersion() { - return SourceVersion.latest(); + return SourceVersion.RELEASE_21; } @Override diff --git a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/EvaluatorProcessor.java b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/EvaluatorProcessor.java index 09012c7b3a48a..ec36908833661 100644 --- a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/EvaluatorProcessor.java +++ b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/EvaluatorProcessor.java @@ -44,7 +44,7 @@ public Set getSupportedAnnotationTypes() { @Override public SourceVersion getSupportedSourceVersion() { - return SourceVersion.RELEASE_17; + return SourceVersion.RELEASE_21; } @Override diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/EsqlFunctionRegistry.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/EsqlFunctionRegistry.java index c64cbdbd2a9ed..0d50623fe77eb 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/EsqlFunctionRegistry.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/EsqlFunctionRegistry.java @@ -199,6 +199,7 @@ public class EsqlFunctionRegistry { private SnapshotFunctionRegistry snapshotRegistry = null; + @SuppressWarnings("this-escape") public EsqlFunctionRegistry() { register(functions()); buildDataTypesForStringLiteralConversion(functions()); From 77e476e14cd483d0b74ef3fb3c97178f8ba8b297 Mon Sep 17 00:00:00 2001 From: ChrisHegarty Date: Wed, 28 Aug 2024 08:42:01 +0100 Subject: [PATCH 2/5] bump ci build versions --- .ci/java-versions-aarch64.properties | 2 +- .ci/java-versions.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/java-versions-aarch64.properties b/.ci/java-versions-aarch64.properties index b1e0f4cfe8aff..8815d5011a8e7 100644 --- a/.ci/java-versions-aarch64.properties +++ b/.ci/java-versions-aarch64.properties @@ -4,4 +4,4 @@ # build and test Elasticsearch for this branch. Valid Java versions # are 'java' or 'openjdk' followed by the major release number. -ES_BUILD_JAVA=jdk17 +ES_BUILD_JAVA=jdk21 diff --git a/.ci/java-versions.properties b/.ci/java-versions.properties index 21884973742ba..5ed97ab248c2f 100644 --- a/.ci/java-versions.properties +++ b/.ci/java-versions.properties @@ -4,4 +4,4 @@ # build and test Elasticsearch for this branch. Valid Java versions # are 'java' or 'openjdk' followed by the major release number. -ES_BUILD_JAVA=openjdk17 +ES_BUILD_JAVA=openjdk21 From 513069cc10ca86a04f13ce8b4523383ce04a6dc1 Mon Sep 17 00:00:00 2001 From: ChrisHegarty Date: Thu, 29 Aug 2024 12:44:35 +0100 Subject: [PATCH 3/5] bump fips java version --- .ci/java-versions-fips.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/java-versions-fips.properties b/.ci/java-versions-fips.properties index fa68739355768..87490374bb994 100644 --- a/.ci/java-versions-fips.properties +++ b/.ci/java-versions-fips.properties @@ -4,4 +4,4 @@ # build and test Elasticsearch for this branch. Valid Java versions # are 'java' or 'openjdk' followed by the major release number. -ES_BUILD_JAVA=openjdk17 +ES_BUILD_JAVA=openjdk21 From c8a7b93e8b53dbec2d2e45fe0c03e4025ed8e012 Mon Sep 17 00:00:00 2001 From: ChrisHegarty Date: Fri, 30 Aug 2024 11:23:02 +0100 Subject: [PATCH 4/5] Bump byte buddy --- gradle/build.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml index 12f7776add17b..35c26ef10f9ec 100644 --- a/gradle/build.versions.toml +++ b/gradle/build.versions.toml @@ -11,7 +11,7 @@ apache-compress = "org.apache.commons:commons-compress:1.26.1" apache-rat = "org.apache.rat:apache-rat:0.11" asm = { group = "org.ow2.asm", name="asm", version.ref="asm" } asm-tree = { group = "org.ow2.asm", name="asm-tree", version.ref="asm" } -bytebuddy = "net.bytebuddy:byte-buddy:1.12.10" +bytebuddy = "net.bytebuddy:byte-buddy:1.14.12" checkstyle = "com.puppycrawl.tools:checkstyle:10.3" commons-codec = "commons-codec:commons-codec:1.11" commmons-io = "commons-io:commons-io:2.2" From 23ae2106c5071cbb96c71fa6d6e3de39f19b3405 Mon Sep 17 00:00:00 2001 From: Chris Hegarty <62058229+ChrisHegarty@users.noreply.github.com> Date: Sat, 31 Aug 2024 07:51:00 +0100 Subject: [PATCH 5/5] Update integTest minimumCompilerVersion --- .../src/main/resources/minimumCompilerVersion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/build-tools-internal/src/main/resources/minimumCompilerVersion b/build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/build-tools-internal/src/main/resources/minimumCompilerVersion index 98d9bcb75a685..aabe6ec3909c9 100644 --- a/build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/build-tools-internal/src/main/resources/minimumCompilerVersion +++ b/build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/build-tools-internal/src/main/resources/minimumCompilerVersion @@ -1 +1 @@ -17 +21