From 6a04f679e6e2b66562e4e6759547177891c407bc Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 4 Feb 2026 10:30:55 +0000 Subject: [PATCH 01/15] update guice to 6 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index b2e228cf2dbf..e669d7f435b8 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ 7.5.2 8.5.4 32.1.3-jre - 5.1.0 + 6.0.0 2.2 12.0.30 1.19.4 @@ -645,7 +645,7 @@ jakarta.inject jakarta.inject-api - 1.0.3 + 2.0.1 javax.el @@ -1028,12 +1028,12 @@ org.ow2.asm asm - 9.8 + 9.9.1 org.ow2.asm asm-commons - 9.8 + 9.9.1 org.asynchttpclient From 415cbfd91cdac9e73132ea7ca5a8c1f25008bc41 Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 4 Feb 2026 10:45:15 +0000 Subject: [PATCH 02/15] update licenses --- licenses.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/licenses.yaml b/licenses.yaml index 00f6ec58d9c9..11be1110ac57 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -366,7 +366,7 @@ name: Guice license_category: binary module: java-core license_name: Apache License version 2.0 -version: 5.1.0 +version: 6.0.0 libraries: - com.google.inject: guice - com.google.inject.extensions: guice-servlet @@ -1580,7 +1580,7 @@ name: Jakarta Dependency Injection license_category: binary module: java-core license_name: Apache License version 2.0 -version: 1.0.3 +version: 2.0.1 libraries: - jakarta.inject: jakarta.inject-api @@ -3488,7 +3488,7 @@ name: ASM license_category: binary module: java-core license_name: BSD-3-Clause License -version: 9.8 +version: 9.9.1 copyright: INRIA, France Telecom license_file_path: licenses/bin/asm.BSD3 libraries: From 28d7dd8c4215c970f2b645e4c2c44e1151232ea2 Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 4 Feb 2026 11:29:13 +0000 Subject: [PATCH 03/15] u --- pom.xml | 6 ++++++ processing/pom.xml | 6 ------ server/pom.xml | 9 +++++++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index dafa61a54f4f..e2de516554f1 100644 --- a/pom.xml +++ b/pom.xml @@ -642,6 +642,12 @@ jakarta.inject-api 2.0.1 + + javax.inject + javax.inject + 1 + provided + javax.el javax.el-api diff --git a/processing/pom.xml b/processing/pom.xml index 4310670f0f60..eb74e83d0600 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -107,15 +107,9 @@ com.google.errorprone error_prone_annotations - - jakarta.inject - jakarta.inject-api - javax.inject javax.inject - 1 - provided jakarta.validation diff --git a/server/pom.xml b/server/pom.xml index 17846f53e5cd..ac42aa1ebf7d 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -321,10 +321,15 @@ com.fasterxml.jackson.module jackson-module-guice - + org.apache.commons commons-lang3 - + + + javax.inject + javax.inject + + From 9a74f9c7f1af5356181f3da4b9258acd2fb5ef36 Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 4 Feb 2026 11:52:01 +0000 Subject: [PATCH 04/15] use jakarta --- .../druid/grpc/server/AnonymousAuthServerInterceptor.java | 2 +- .../druid/grpc/server/BasicAuthServerInterceptor.java | 2 +- .../apache/druid/grpc/server/GrpcEndpointInitializer.java | 2 +- .../apache/druid/catalog/http/CatalogListenerResource.java | 2 +- .../java/org/apache/druid/catalog/http/CatalogResource.java | 2 +- .../org/apache/druid/catalog/storage/CatalogStorage.java | 2 +- .../druid/catalog/storage/MetadataStorageManager.java | 2 +- .../apache/druid/catalog/sync/CachedMetadataCatalog.java | 2 +- .../java/org/apache/druid/catalog/sync/CatalogClient.java | 2 +- .../apache/druid/catalog/sync/CatalogUpdateNotifier.java | 2 +- .../apache/druid/catalog/sync/CatalogUpdateReceiver.java | 2 +- .../org/apache/druid/catalog/sync/LocalMetadataCatalog.java | 2 +- .../execution/KubernetesTaskExecutionConfigResource.java | 2 +- .../indexing/overlord/WorkerTaskRunnerQueryAdapter.java | 2 +- .../overlord/duty/KillUnreferencedIndexingState.java | 2 +- .../druid/indexing/overlord/sampler/InputSourceSampler.java | 2 +- .../org/apache/druid/catalog/sql/LiveCatalogResolver.java | 2 +- pom.xml | 6 ------ processing/pom.xml | 4 ++-- .../main/java/org/apache/druid/guice/ExtensionsLoader.java | 2 +- .../main/java/org/apache/druid/guice/ExtensionsModule.java | 2 +- .../apache/druid/query/expression/GuiceExprMacroTable.java | 2 +- .../druid/query/expression/NestedDataExpressions.java | 2 +- .../query/groupby/GroupByResourcesReservationPool.java | 2 +- .../java/org/apache/druid/quidem/QuidemCaptureResource.java | 2 +- server/pom.xml | 5 ----- .../org/apache/druid/catalog/model/TableDefnRegistry.java | 2 +- .../main/java/org/apache/druid/server/StatusResource.java | 2 +- .../server/http/CoordinatorDynamicConfigsResource.java | 2 +- .../org/apache/druid/server/http/HistoricalResource.java | 2 +- .../org/apache/druid/guice/DruidInjectorBuilderTest.java | 2 +- services/src/main/java/org/apache/druid/cli/Version.java | 2 +- .../apache/druid/sql/avatica/DruidAvaticaJsonHandler.java | 2 +- .../druid/sql/avatica/DruidAvaticaProtobufHandler.java | 2 +- .../sql/calcite/aggregation/builtin/CountSqlAggregator.java | 2 +- .../org/apache/druid/sql/calcite/schema/DruidSchema.java | 2 +- .../org/apache/druid/sql/calcite/util/SqlTestFramework.java | 2 +- 37 files changed, 36 insertions(+), 47 deletions(-) diff --git a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/AnonymousAuthServerInterceptor.java b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/AnonymousAuthServerInterceptor.java index 3059c603d479..6c1a10534471 100644 --- a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/AnonymousAuthServerInterceptor.java +++ b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/AnonymousAuthServerInterceptor.java @@ -29,7 +29,7 @@ import io.grpc.ServerInterceptor; import org.apache.druid.server.security.Authenticator; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * "Authorizes" an anonymous request, which just means adding an "allow all" diff --git a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/BasicAuthServerInterceptor.java b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/BasicAuthServerInterceptor.java index 15a4926e2099..32b5454d6506 100644 --- a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/BasicAuthServerInterceptor.java +++ b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/BasicAuthServerInterceptor.java @@ -34,7 +34,7 @@ import org.apache.druid.server.security.AuthenticationResult; import org.apache.druid.server.security.Authenticator; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * Authorizes a Basic Auth user name and password and sets the resulting diff --git a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/GrpcEndpointInitializer.java b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/GrpcEndpointInitializer.java index 68a67e3bc786..99d8cecd77b8 100644 --- a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/GrpcEndpointInitializer.java +++ b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/GrpcEndpointInitializer.java @@ -32,7 +32,7 @@ import org.apache.druid.server.security.AuthenticatorMapper; import org.apache.druid.sql.SqlStatementFactory; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.IOException; diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogListenerResource.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogListenerResource.java index c100fbbbad82..c05c7d76c766 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogListenerResource.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogListenerResource.java @@ -25,7 +25,7 @@ import org.apache.druid.catalog.sync.UpdateEvent; import org.apache.druid.server.http.security.ConfigResourceFilter; -import javax.inject.Inject; +import jakarta.inject.Inject; import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogResource.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogResource.java index a766b86caec6..1db6d75b9ec5 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogResource.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogResource.java @@ -43,7 +43,7 @@ import org.apache.druid.server.security.ResourceAction; import org.apache.druid.server.security.ResourceType; -import javax.inject.Inject; +import jakarta.inject.Inject; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/CatalogStorage.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/CatalogStorage.java index a0c623ba46b7..8ef2fe742fe6 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/CatalogStorage.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/CatalogStorage.java @@ -35,7 +35,7 @@ import org.apache.druid.guice.annotations.Json; import javax.annotation.Nullable; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; /** diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/MetadataStorageManager.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/MetadataStorageManager.java index b5c7173698ee..f0477ac734df 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/MetadataStorageManager.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/MetadataStorageManager.java @@ -27,7 +27,7 @@ import org.apache.druid.metadata.MetadataStorageTablesConfig; import org.apache.druid.metadata.SQLMetadataConnector; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * Represents the metastore manager database and its implementation. diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CachedMetadataCatalog.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CachedMetadataCatalog.java index e164bcd06414..4c523a0afc56 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CachedMetadataCatalog.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CachedMetadataCatalog.java @@ -30,7 +30,7 @@ import org.apache.druid.guice.annotations.Json; import org.apache.druid.java.util.common.logger.Logger; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogClient.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogClient.java index 1c3a2be487b7..fc5c6424e235 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogClient.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogClient.java @@ -45,7 +45,7 @@ import org.jboss.netty.handler.codec.http.HttpMethod; import javax.annotation.Nullable; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Collections; import java.util.List; diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateNotifier.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateNotifier.java index b91cf6d3ea0d..d0a0aebcf521 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateNotifier.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateNotifier.java @@ -37,7 +37,7 @@ import org.apache.druid.server.DruidNode; import org.joda.time.Duration; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.function.Supplier; /** diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateReceiver.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateReceiver.java index 61cfa56d2098..0b06b9aad2f4 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateReceiver.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateReceiver.java @@ -30,7 +30,7 @@ import org.apache.druid.java.util.emitter.EmittingLogger; import org.joda.time.Duration; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadLocalRandom; diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/LocalMetadataCatalog.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/LocalMetadataCatalog.java index 94e9ff1128a4..36259e489090 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/LocalMetadataCatalog.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/LocalMetadataCatalog.java @@ -26,7 +26,7 @@ import org.apache.druid.catalog.model.TableId; import org.apache.druid.catalog.model.TableMetadata; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Collections; import java.util.HashSet; import java.util.List; diff --git a/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskExecutionConfigResource.java b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskExecutionConfigResource.java index 432a41933ede..6993dbc10bd2 100644 --- a/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskExecutionConfigResource.java +++ b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskExecutionConfigResource.java @@ -31,7 +31,7 @@ import org.apache.druid.server.security.AuthorizationUtils; import org.joda.time.Interval; -import javax.inject.Inject; +import jakarta.inject.Inject; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; import javax.ws.rs.GET; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/WorkerTaskRunnerQueryAdapter.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/WorkerTaskRunnerQueryAdapter.java index 362a832c80ac..ebad9d64ee31 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/WorkerTaskRunnerQueryAdapter.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/WorkerTaskRunnerQueryAdapter.java @@ -34,7 +34,7 @@ import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponseStatus; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.net.URL; import java.util.concurrent.ExecutionException; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/duty/KillUnreferencedIndexingState.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/duty/KillUnreferencedIndexingState.java index a00688b6ea22..c03ff5dc1e98 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/duty/KillUnreferencedIndexingState.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/duty/KillUnreferencedIndexingState.java @@ -24,7 +24,7 @@ import org.apache.druid.segment.metadata.IndexingStateStorage; import org.joda.time.DateTime; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; /** diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/InputSourceSampler.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/InputSourceSampler.java index 5541fb1374b9..0a2adc29fcae 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/InputSourceSampler.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/InputSourceSampler.java @@ -54,7 +54,7 @@ import org.apache.druid.segment.indexing.DataSchema; import javax.annotation.Nullable; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.File; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/multi-stage-query/src/main/java/org/apache/druid/catalog/sql/LiveCatalogResolver.java b/multi-stage-query/src/main/java/org/apache/druid/catalog/sql/LiveCatalogResolver.java index 0e010a521685..869cad4a144d 100644 --- a/multi-stage-query/src/main/java/org/apache/druid/catalog/sql/LiveCatalogResolver.java +++ b/multi-stage-query/src/main/java/org/apache/druid/catalog/sql/LiveCatalogResolver.java @@ -38,7 +38,7 @@ import org.apache.druid.sql.calcite.table.DruidTable; import javax.annotation.Nullable; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/pom.xml b/pom.xml index e2de516554f1..dafa61a54f4f 100644 --- a/pom.xml +++ b/pom.xml @@ -642,12 +642,6 @@ jakarta.inject-api 2.0.1 - - javax.inject - javax.inject - 1 - provided - javax.el javax.el-api diff --git a/processing/pom.xml b/processing/pom.xml index eb74e83d0600..8896557f786f 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -108,8 +108,8 @@ error_prone_annotations - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api jakarta.validation diff --git a/processing/src/main/java/org/apache/druid/guice/ExtensionsLoader.java b/processing/src/main/java/org/apache/druid/guice/ExtensionsLoader.java index cae76196b53c..df4cb8329ea8 100644 --- a/processing/src/main/java/org/apache/druid/guice/ExtensionsLoader.java +++ b/processing/src/main/java/org/apache/druid/guice/ExtensionsLoader.java @@ -33,7 +33,7 @@ import org.apache.druid.java.util.common.logger.Logger; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.File; import java.io.FilenameFilter; import java.io.IOException; diff --git a/processing/src/main/java/org/apache/druid/guice/ExtensionsModule.java b/processing/src/main/java/org/apache/druid/guice/ExtensionsModule.java index 54010d3bd186..a51dc5f5fcab 100644 --- a/processing/src/main/java/org/apache/druid/guice/ExtensionsModule.java +++ b/processing/src/main/java/org/apache/druid/guice/ExtensionsModule.java @@ -22,7 +22,7 @@ import com.google.inject.Binder; import com.google.inject.Module; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * Module for the extensions loader. Add to the startup injector diff --git a/processing/src/main/java/org/apache/druid/query/expression/GuiceExprMacroTable.java b/processing/src/main/java/org/apache/druid/query/expression/GuiceExprMacroTable.java index ce05debcf6d4..5fcc2bbed6ec 100644 --- a/processing/src/main/java/org/apache/druid/query/expression/GuiceExprMacroTable.java +++ b/processing/src/main/java/org/apache/druid/query/expression/GuiceExprMacroTable.java @@ -20,9 +20,9 @@ package org.apache.druid.query.expression; import com.google.common.collect.ImmutableList; +import jakarta.inject.Inject; import org.apache.druid.math.expr.ExprMacroTable; -import javax.inject.Inject; import java.util.Set; public class GuiceExprMacroTable extends ExprMacroTable diff --git a/processing/src/main/java/org/apache/druid/query/expression/NestedDataExpressions.java b/processing/src/main/java/org/apache/druid/query/expression/NestedDataExpressions.java index a3a59d36adf8..4ca58e49a447 100644 --- a/processing/src/main/java/org/apache/druid/query/expression/NestedDataExpressions.java +++ b/processing/src/main/java/org/apache/druid/query/expression/NestedDataExpressions.java @@ -22,6 +22,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.inject.Inject; import org.apache.druid.error.DruidException; import org.apache.druid.guice.annotations.Json; import org.apache.druid.math.expr.Expr; @@ -37,7 +38,6 @@ import org.apache.druid.segment.nested.StructuredDataProcessor; import javax.annotation.Nullable; -import javax.inject.Inject; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; diff --git a/processing/src/main/java/org/apache/druid/query/groupby/GroupByResourcesReservationPool.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupByResourcesReservationPool.java index bd585dc7218c..4cc204d3d0ec 100644 --- a/processing/src/main/java/org/apache/druid/query/groupby/GroupByResourcesReservationPool.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupByResourcesReservationPool.java @@ -25,7 +25,7 @@ import org.apache.druid.query.QueryResourceId; import javax.annotation.Nullable; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.nio.ByteBuffer; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; diff --git a/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemCaptureResource.java b/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemCaptureResource.java index 68d2f31ac81a..716e6cfd74e2 100644 --- a/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemCaptureResource.java +++ b/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemCaptureResource.java @@ -24,7 +24,7 @@ import org.apache.druid.java.util.common.StringUtils; import org.apache.druid.sql.hook.DruidHookDispatcher; -import javax.inject.Named; +import jakarta.inject.Named; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; diff --git a/server/pom.xml b/server/pom.xml index ac42aa1ebf7d..319e129173b1 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -325,11 +325,6 @@ org.apache.commons commons-lang3 - - javax.inject - javax.inject - - diff --git a/server/src/main/java/org/apache/druid/catalog/model/TableDefnRegistry.java b/server/src/main/java/org/apache/druid/catalog/model/TableDefnRegistry.java index 1a14d7403937..8cbef9ac4bc6 100644 --- a/server/src/main/java/org/apache/druid/catalog/model/TableDefnRegistry.java +++ b/server/src/main/java/org/apache/druid/catalog/model/TableDefnRegistry.java @@ -34,7 +34,7 @@ import org.apache.druid.java.util.common.IAE; import javax.annotation.Nullable; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Arrays; import java.util.List; import java.util.Map; diff --git a/server/src/main/java/org/apache/druid/server/StatusResource.java b/server/src/main/java/org/apache/druid/server/StatusResource.java index 29aaae98c257..1e5c7e3ddd7d 100644 --- a/server/src/main/java/org/apache/druid/server/StatusResource.java +++ b/server/src/main/java/org/apache/druid/server/StatusResource.java @@ -33,7 +33,7 @@ import org.apache.druid.utils.RuntimeInfo; import javax.annotation.Nonnull; -import javax.inject.Inject; +import jakarta.inject.Inject; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/server/src/main/java/org/apache/druid/server/http/CoordinatorDynamicConfigsResource.java b/server/src/main/java/org/apache/druid/server/http/CoordinatorDynamicConfigsResource.java index 93feb328a8c2..6be847539945 100644 --- a/server/src/main/java/org/apache/druid/server/http/CoordinatorDynamicConfigsResource.java +++ b/server/src/main/java/org/apache/druid/server/http/CoordinatorDynamicConfigsResource.java @@ -33,7 +33,7 @@ import org.joda.time.Interval; import javax.annotation.Nullable; -import javax.inject.Inject; +import jakarta.inject.Inject; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; import javax.ws.rs.GET; diff --git a/server/src/main/java/org/apache/druid/server/http/HistoricalResource.java b/server/src/main/java/org/apache/druid/server/http/HistoricalResource.java index 8a049fa4d8e9..5399b41c70a8 100644 --- a/server/src/main/java/org/apache/druid/server/http/HistoricalResource.java +++ b/server/src/main/java/org/apache/druid/server/http/HistoricalResource.java @@ -24,7 +24,7 @@ import org.apache.druid.server.coordination.SegmentCacheBootstrapper; import org.apache.druid.server.http.security.StateResourceFilter; -import javax.inject.Inject; +import jakarta.inject.Inject; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; diff --git a/server/src/test/java/org/apache/druid/guice/DruidInjectorBuilderTest.java b/server/src/test/java/org/apache/druid/guice/DruidInjectorBuilderTest.java index d55ebe8f16b1..9405c7838a50 100644 --- a/server/src/test/java/org/apache/druid/guice/DruidInjectorBuilderTest.java +++ b/server/src/test/java/org/apache/druid/guice/DruidInjectorBuilderTest.java @@ -37,7 +37,7 @@ import org.apache.druid.java.util.common.ISE; import org.junit.Test; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.IOException; import java.util.Arrays; import java.util.List; diff --git a/services/src/main/java/org/apache/druid/cli/Version.java b/services/src/main/java/org/apache/druid/cli/Version.java index 677c4d9da769..e594da1ed434 100644 --- a/services/src/main/java/org/apache/druid/cli/Version.java +++ b/services/src/main/java/org/apache/druid/cli/Version.java @@ -25,7 +25,7 @@ import org.apache.druid.server.StatusResource; import org.apache.druid.utils.RuntimeInfo; -import javax.inject.Inject; +import jakarta.inject.Inject; @Command( name = "version", diff --git a/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaJsonHandler.java b/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaJsonHandler.java index f6d0738e2321..b8df90a13eda 100644 --- a/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaJsonHandler.java +++ b/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaJsonHandler.java @@ -34,7 +34,7 @@ import org.eclipse.jetty.server.Response; import org.eclipse.jetty.util.Callback; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; diff --git a/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaProtobufHandler.java b/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaProtobufHandler.java index 7d5c6183025a..abc5fb42792d 100644 --- a/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaProtobufHandler.java +++ b/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaProtobufHandler.java @@ -36,7 +36,7 @@ import org.eclipse.jetty.server.Response; import org.eclipse.jetty.util.Callback; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/CountSqlAggregator.java b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/CountSqlAggregator.java index 572d276a0bd3..c2e5071c1439 100644 --- a/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/CountSqlAggregator.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/CountSqlAggregator.java @@ -43,7 +43,7 @@ import org.apache.druid.sql.calcite.rel.VirtualColumnRegistry; import javax.annotation.Nullable; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; public class CountSqlAggregator implements SqlAggregator diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/schema/DruidSchema.java b/sql/src/main/java/org/apache/druid/sql/calcite/schema/DruidSchema.java index 96cd166b1565..25c07fad3be1 100644 --- a/sql/src/main/java/org/apache/druid/sql/calcite/schema/DruidSchema.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/schema/DruidSchema.java @@ -24,7 +24,7 @@ import org.apache.druid.sql.calcite.table.DatasourceTable; import org.apache.druid.sql.calcite.table.DruidTable; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Set; diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java b/sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java index 607b159ad8f2..25dc0e20dc42 100644 --- a/sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java @@ -126,7 +126,7 @@ import org.apache.druid.timeline.DataSegment; import org.apache.druid.utils.JvmUtils; -import javax.inject.Named; +import jakarta.inject.Named; import java.io.Closeable; import java.io.File; import java.io.IOException; From ae21c822c171eb67a9a4ebdd1d51ff46cea519e9 Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 4 Feb 2026 12:14:45 +0000 Subject: [PATCH 05/15] move imports --- .../druid/grpc/server/AnonymousAuthServerInterceptor.java | 3 +-- .../apache/druid/grpc/server/BasicAuthServerInterceptor.java | 3 +-- .../org/apache/druid/grpc/server/GrpcEndpointInitializer.java | 3 +-- .../org/apache/druid/catalog/http/CatalogListenerResource.java | 2 +- .../java/org/apache/druid/catalog/http/CatalogResource.java | 2 +- .../java/org/apache/druid/catalog/storage/CatalogStorage.java | 2 +- .../apache/druid/catalog/storage/MetadataStorageManager.java | 3 +-- .../org/apache/druid/catalog/sync/CachedMetadataCatalog.java | 3 +-- .../main/java/org/apache/druid/catalog/sync/CatalogClient.java | 2 +- .../org/apache/druid/catalog/sync/CatalogUpdateNotifier.java | 3 +-- .../org/apache/druid/catalog/sync/CatalogUpdateReceiver.java | 3 +-- .../org/apache/druid/catalog/sync/LocalMetadataCatalog.java | 3 +-- .../execution/KubernetesTaskExecutionConfigResource.java | 2 +- .../druid/indexing/overlord/WorkerTaskRunnerQueryAdapter.java | 3 +-- .../indexing/overlord/duty/KillUnreferencedIndexingState.java | 2 +- .../druid/indexing/overlord/sampler/InputSourceSampler.java | 3 ++- .../java/org/apache/druid/catalog/sql/LiveCatalogResolver.java | 2 +- .../src/main/java/org/apache/druid/guice/ExtensionsLoader.java | 3 +-- .../src/main/java/org/apache/druid/guice/ExtensionsModule.java | 1 - .../druid/query/groupby/GroupByResourcesReservationPool.java | 2 +- .../java/org/apache/druid/quidem/QuidemCaptureResource.java | 2 +- .../java/org/apache/druid/catalog/model/TableDefnRegistry.java | 2 +- .../src/main/java/org/apache/druid/server/StatusResource.java | 2 +- .../druid/server/http/CoordinatorDynamicConfigsResource.java | 2 +- .../java/org/apache/druid/server/http/HistoricalResource.java | 2 +- .../java/org/apache/druid/guice/DruidInjectorBuilderTest.java | 3 +-- services/src/main/java/org/apache/druid/cli/Version.java | 3 +-- .../org/apache/druid/sql/avatica/DruidAvaticaJsonHandler.java | 2 +- .../apache/druid/sql/avatica/DruidAvaticaProtobufHandler.java | 2 +- .../sql/calcite/aggregation/builtin/CountSqlAggregator.java | 2 +- .../java/org/apache/druid/sql/calcite/schema/DruidSchema.java | 3 +-- .../org/apache/druid/sql/calcite/util/SqlTestFramework.java | 2 +- 32 files changed, 32 insertions(+), 45 deletions(-) diff --git a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/AnonymousAuthServerInterceptor.java b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/AnonymousAuthServerInterceptor.java index 6c1a10534471..4543871862bb 100644 --- a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/AnonymousAuthServerInterceptor.java +++ b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/AnonymousAuthServerInterceptor.java @@ -27,9 +27,8 @@ import io.grpc.ServerCall.Listener; import io.grpc.ServerCallHandler; import io.grpc.ServerInterceptor; -import org.apache.druid.server.security.Authenticator; - import jakarta.inject.Inject; +import org.apache.druid.server.security.Authenticator; /** * "Authorizes" an anonymous request, which just means adding an "allow all" diff --git a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/BasicAuthServerInterceptor.java b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/BasicAuthServerInterceptor.java index 32b5454d6506..4cd2ffeb902b 100644 --- a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/BasicAuthServerInterceptor.java +++ b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/BasicAuthServerInterceptor.java @@ -29,13 +29,12 @@ import io.grpc.ServerInterceptor; import io.grpc.Status; import io.grpc.StatusRuntimeException; +import jakarta.inject.Inject; import org.apache.druid.java.util.common.StringUtils; import org.apache.druid.java.util.common.logger.Logger; import org.apache.druid.server.security.AuthenticationResult; import org.apache.druid.server.security.Authenticator; -import jakarta.inject.Inject; - /** * Authorizes a Basic Auth user name and password and sets the resulting * {@link AuthenticationResult} on the call context. diff --git a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/GrpcEndpointInitializer.java b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/GrpcEndpointInitializer.java index 99d8cecd77b8..d53f95b950e9 100644 --- a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/GrpcEndpointInitializer.java +++ b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/GrpcEndpointInitializer.java @@ -20,6 +20,7 @@ package org.apache.druid.grpc.server; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.inject.Inject; import org.apache.druid.guice.ManageLifecycleServer; import org.apache.druid.guice.annotations.Json; import org.apache.druid.guice.annotations.NativeQuery; @@ -32,8 +33,6 @@ import org.apache.druid.server.security.AuthenticatorMapper; import org.apache.druid.sql.SqlStatementFactory; -import jakarta.inject.Inject; - import java.io.IOException; /** diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogListenerResource.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogListenerResource.java index c05c7d76c766..c63374d381b4 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogListenerResource.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogListenerResource.java @@ -21,11 +21,11 @@ import com.fasterxml.jackson.jaxrs.smile.SmileMediaTypes; import com.sun.jersey.spi.container.ResourceFilters; +import jakarta.inject.Inject; import org.apache.druid.catalog.sync.CatalogUpdateListener; import org.apache.druid.catalog.sync.UpdateEvent; import org.apache.druid.server.http.security.ConfigResourceFilter; -import jakarta.inject.Inject; import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogResource.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogResource.java index 1db6d75b9ec5..db89935554e7 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogResource.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogResource.java @@ -22,6 +22,7 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; +import jakarta.inject.Inject; import org.apache.druid.catalog.CatalogException; import org.apache.druid.catalog.CatalogException.DuplicateKeyException; import org.apache.druid.catalog.CatalogException.NotFoundException; @@ -43,7 +44,6 @@ import org.apache.druid.server.security.ResourceAction; import org.apache.druid.server.security.ResourceType; -import jakarta.inject.Inject; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/CatalogStorage.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/CatalogStorage.java index 8ef2fe742fe6..126ff8cfe7e3 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/CatalogStorage.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/CatalogStorage.java @@ -20,6 +20,7 @@ package org.apache.druid.catalog.storage; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.inject.Inject; import org.apache.druid.catalog.CatalogException.NotFoundException; import org.apache.druid.catalog.model.ResolvedTable; import org.apache.druid.catalog.model.SchemaRegistry; @@ -35,7 +36,6 @@ import org.apache.druid.guice.annotations.Json; import javax.annotation.Nullable; -import jakarta.inject.Inject; import java.util.List; /** diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/MetadataStorageManager.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/MetadataStorageManager.java index f0477ac734df..0febb07d71ac 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/MetadataStorageManager.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/MetadataStorageManager.java @@ -21,14 +21,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Supplier; +import jakarta.inject.Inject; import org.apache.druid.guice.annotations.Json; import org.apache.druid.metadata.MetadataStorageConnector; import org.apache.druid.metadata.MetadataStorageConnectorConfig; import org.apache.druid.metadata.MetadataStorageTablesConfig; import org.apache.druid.metadata.SQLMetadataConnector; -import jakarta.inject.Inject; - /** * Represents the metastore manager database and its implementation. * Abstracts away the various kick-knacks used to define the metastore. diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CachedMetadataCatalog.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CachedMetadataCatalog.java index 4c523a0afc56..53e8d32a87e5 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CachedMetadataCatalog.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CachedMetadataCatalog.java @@ -20,6 +20,7 @@ package org.apache.druid.catalog.sync; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.inject.Inject; import org.apache.druid.catalog.MetadataCatalog; import org.apache.druid.catalog.model.ResolvedTable; import org.apache.druid.catalog.model.SchemaRegistry; @@ -29,8 +30,6 @@ import org.apache.druid.catalog.model.TableMetadata; import org.apache.druid.guice.annotations.Json; import org.apache.druid.java.util.common.logger.Logger; - -import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogClient.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogClient.java index fc5c6424e235..07e377b7d805 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogClient.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogClient.java @@ -22,6 +22,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.util.concurrent.ListenableFuture; +import jakarta.inject.Inject; import org.apache.druid.catalog.http.CatalogResource; import org.apache.druid.catalog.model.ResolvedTable; import org.apache.druid.catalog.model.TableDefnRegistry; @@ -45,7 +46,6 @@ import org.jboss.netty.handler.codec.http.HttpMethod; import javax.annotation.Nullable; -import jakarta.inject.Inject; import java.util.Collections; import java.util.List; diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateNotifier.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateNotifier.java index d0a0aebcf521..3b462f63d4e2 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateNotifier.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateNotifier.java @@ -21,6 +21,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; +import jakarta.inject.Inject; import org.apache.druid.catalog.http.CatalogListenerResource; import org.apache.druid.catalog.storage.CatalogStorage; import org.apache.druid.catalog.sync.RestUpdateSender.RestSender; @@ -36,8 +37,6 @@ import org.apache.druid.java.util.http.client.HttpClient; import org.apache.druid.server.DruidNode; import org.joda.time.Duration; - -import jakarta.inject.Inject; import java.util.function.Supplier; /** diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateReceiver.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateReceiver.java index 0b06b9aad2f4..ef79c62421ff 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateReceiver.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateReceiver.java @@ -19,6 +19,7 @@ package org.apache.druid.catalog.sync; +import jakarta.inject.Inject; import org.apache.druid.concurrent.LifecycleLock; import org.apache.druid.guice.ManageLifecycle; import org.apache.druid.java.util.common.ISE; @@ -29,8 +30,6 @@ import org.apache.druid.java.util.common.lifecycle.LifecycleStop; import org.apache.druid.java.util.emitter.EmittingLogger; import org.joda.time.Duration; - -import jakarta.inject.Inject; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadLocalRandom; diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/LocalMetadataCatalog.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/LocalMetadataCatalog.java index 36259e489090..b8cdfbbf0590 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/LocalMetadataCatalog.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/LocalMetadataCatalog.java @@ -19,14 +19,13 @@ package org.apache.druid.catalog.sync; +import jakarta.inject.Inject; import org.apache.druid.catalog.MetadataCatalog; import org.apache.druid.catalog.model.ResolvedTable; import org.apache.druid.catalog.model.SchemaRegistry; import org.apache.druid.catalog.model.SchemaRegistry.SchemaSpec; import org.apache.druid.catalog.model.TableId; import org.apache.druid.catalog.model.TableMetadata; - -import jakarta.inject.Inject; import java.util.Collections; import java.util.HashSet; import java.util.List; diff --git a/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskExecutionConfigResource.java b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskExecutionConfigResource.java index 6993dbc10bd2..4c12e4469afb 100644 --- a/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskExecutionConfigResource.java +++ b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskExecutionConfigResource.java @@ -21,6 +21,7 @@ import com.google.common.collect.ImmutableMap; import com.sun.jersey.spi.container.ResourceFilters; +import jakarta.inject.Inject; import org.apache.druid.audit.AuditEntry; import org.apache.druid.audit.AuditManager; import org.apache.druid.common.config.ConfigManager; @@ -31,7 +32,6 @@ import org.apache.druid.server.security.AuthorizationUtils; import org.joda.time.Interval; -import jakarta.inject.Inject; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; import javax.ws.rs.GET; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/WorkerTaskRunnerQueryAdapter.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/WorkerTaskRunnerQueryAdapter.java index ebad9d64ee31..e3bcbe5fd93e 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/WorkerTaskRunnerQueryAdapter.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/WorkerTaskRunnerQueryAdapter.java @@ -23,6 +23,7 @@ import com.google.common.base.Throwables; import com.google.common.collect.Iterables; import io.netty.handler.timeout.TimeoutException; +import jakarta.inject.Inject; import org.apache.druid.guice.annotations.EscalatedGlobal; import org.apache.druid.indexing.overlord.hrtr.HttpRemoteTaskRunner; import org.apache.druid.java.util.common.RE; @@ -33,8 +34,6 @@ import org.apache.druid.java.util.http.client.response.StatusResponseHolder; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponseStatus; - -import jakarta.inject.Inject; import java.net.URL; import java.util.concurrent.ExecutionException; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/duty/KillUnreferencedIndexingState.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/duty/KillUnreferencedIndexingState.java index c03ff5dc1e98..f43125278209 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/duty/KillUnreferencedIndexingState.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/duty/KillUnreferencedIndexingState.java @@ -19,12 +19,12 @@ package org.apache.druid.indexing.overlord.duty; +import jakarta.inject.Inject; import org.apache.druid.indexing.overlord.config.IndexingStateCleanupConfig; import org.apache.druid.java.util.common.logger.Logger; import org.apache.druid.segment.metadata.IndexingStateStorage; import org.joda.time.DateTime; -import jakarta.inject.Inject; import java.util.List; /** diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/InputSourceSampler.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/InputSourceSampler.java index 0a2adc29fcae..0827df6b1d82 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/InputSourceSampler.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/InputSourceSampler.java @@ -21,6 +21,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; +import jakarta.inject.Inject; import org.apache.commons.lang3.ArrayUtils; import org.apache.druid.client.indexing.SamplerResponse; import org.apache.druid.client.indexing.SamplerResponse.SamplerResponseRow; @@ -54,7 +55,7 @@ import org.apache.druid.segment.indexing.DataSchema; import javax.annotation.Nullable; -import jakarta.inject.Inject; + import java.io.File; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/multi-stage-query/src/main/java/org/apache/druid/catalog/sql/LiveCatalogResolver.java b/multi-stage-query/src/main/java/org/apache/druid/catalog/sql/LiveCatalogResolver.java index 869cad4a144d..38d078343f83 100644 --- a/multi-stage-query/src/main/java/org/apache/druid/catalog/sql/LiveCatalogResolver.java +++ b/multi-stage-query/src/main/java/org/apache/druid/catalog/sql/LiveCatalogResolver.java @@ -20,6 +20,7 @@ package org.apache.druid.catalog.sql; import com.google.common.collect.ImmutableSet; +import jakarta.inject.Inject; import org.apache.druid.catalog.MetadataCatalog; import org.apache.druid.catalog.model.ColumnSpec; import org.apache.druid.catalog.model.Columns; @@ -38,7 +39,6 @@ import org.apache.druid.sql.calcite.table.DruidTable; import javax.annotation.Nullable; -import jakarta.inject.Inject; import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/processing/src/main/java/org/apache/druid/guice/ExtensionsLoader.java b/processing/src/main/java/org/apache/druid/guice/ExtensionsLoader.java index df4cb8329ea8..ecc17fdacd3e 100644 --- a/processing/src/main/java/org/apache/druid/guice/ExtensionsLoader.java +++ b/processing/src/main/java/org/apache/druid/guice/ExtensionsLoader.java @@ -24,6 +24,7 @@ import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.concurrent.GuardedBy; import com.google.inject.Injector; +import jakarta.inject.Inject; import org.apache.commons.io.FileUtils; import org.apache.druid.initialization.DruidModule; import org.apache.druid.java.util.common.ISE; @@ -32,8 +33,6 @@ import org.apache.druid.java.util.common.StringUtils; import org.apache.druid.java.util.common.logger.Logger; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; - -import jakarta.inject.Inject; import java.io.File; import java.io.FilenameFilter; import java.io.IOException; diff --git a/processing/src/main/java/org/apache/druid/guice/ExtensionsModule.java b/processing/src/main/java/org/apache/druid/guice/ExtensionsModule.java index a51dc5f5fcab..5654b2533ff2 100644 --- a/processing/src/main/java/org/apache/druid/guice/ExtensionsModule.java +++ b/processing/src/main/java/org/apache/druid/guice/ExtensionsModule.java @@ -21,7 +21,6 @@ import com.google.inject.Binder; import com.google.inject.Module; - import jakarta.inject.Inject; /** diff --git a/processing/src/main/java/org/apache/druid/query/groupby/GroupByResourcesReservationPool.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupByResourcesReservationPool.java index 4cc204d3d0ec..fb55f5203a02 100644 --- a/processing/src/main/java/org/apache/druid/query/groupby/GroupByResourcesReservationPool.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupByResourcesReservationPool.java @@ -19,13 +19,13 @@ package org.apache.druid.query.groupby; +import jakarta.inject.Inject; import org.apache.druid.collections.BlockingPool; import org.apache.druid.error.DruidException; import org.apache.druid.guice.annotations.Merging; import org.apache.druid.query.QueryResourceId; import javax.annotation.Nullable; -import jakarta.inject.Inject; import java.nio.ByteBuffer; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; diff --git a/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemCaptureResource.java b/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemCaptureResource.java index 716e6cfd74e2..3254090a775d 100644 --- a/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemCaptureResource.java +++ b/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemCaptureResource.java @@ -20,11 +20,11 @@ package org.apache.druid.quidem; import com.google.inject.Inject; +import jakarta.inject.Named; import org.apache.druid.guice.LazySingleton; import org.apache.druid.java.util.common.StringUtils; import org.apache.druid.sql.hook.DruidHookDispatcher; -import jakarta.inject.Named; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; diff --git a/server/src/main/java/org/apache/druid/catalog/model/TableDefnRegistry.java b/server/src/main/java/org/apache/druid/catalog/model/TableDefnRegistry.java index 8cbef9ac4bc6..8cdfd0b62d82 100644 --- a/server/src/main/java/org/apache/druid/catalog/model/TableDefnRegistry.java +++ b/server/src/main/java/org/apache/druid/catalog/model/TableDefnRegistry.java @@ -22,6 +22,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; +import jakarta.inject.Inject; import org.apache.druid.catalog.model.table.DatasourceDefn; import org.apache.druid.catalog.model.table.ExternalTableDefn; import org.apache.druid.catalog.model.table.HttpInputSourceDefn; @@ -34,7 +35,6 @@ import org.apache.druid.java.util.common.IAE; import javax.annotation.Nullable; -import jakarta.inject.Inject; import java.util.Arrays; import java.util.List; import java.util.Map; diff --git a/server/src/main/java/org/apache/druid/server/StatusResource.java b/server/src/main/java/org/apache/druid/server/StatusResource.java index 1e5c7e3ddd7d..c5bed1501af8 100644 --- a/server/src/main/java/org/apache/druid/server/StatusResource.java +++ b/server/src/main/java/org/apache/druid/server/StatusResource.java @@ -23,6 +23,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Maps; import com.sun.jersey.spi.container.ResourceFilters; +import jakarta.inject.Inject; import org.apache.druid.client.DruidServerConfig; import org.apache.druid.common.guava.GuavaUtils; import org.apache.druid.guice.ExtensionsLoader; @@ -33,7 +34,6 @@ import org.apache.druid.utils.RuntimeInfo; import javax.annotation.Nonnull; -import jakarta.inject.Inject; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/server/src/main/java/org/apache/druid/server/http/CoordinatorDynamicConfigsResource.java b/server/src/main/java/org/apache/druid/server/http/CoordinatorDynamicConfigsResource.java index 6be847539945..3aa06097fe8b 100644 --- a/server/src/main/java/org/apache/druid/server/http/CoordinatorDynamicConfigsResource.java +++ b/server/src/main/java/org/apache/druid/server/http/CoordinatorDynamicConfigsResource.java @@ -20,6 +20,7 @@ package org.apache.druid.server.http; import com.sun.jersey.spi.container.ResourceFilters; +import jakarta.inject.Inject; import org.apache.druid.audit.AuditManager; import org.apache.druid.common.config.ConfigManager.SetResult; import org.apache.druid.java.util.common.Intervals; @@ -33,7 +34,6 @@ import org.joda.time.Interval; import javax.annotation.Nullable; -import jakarta.inject.Inject; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; import javax.ws.rs.GET; diff --git a/server/src/main/java/org/apache/druid/server/http/HistoricalResource.java b/server/src/main/java/org/apache/druid/server/http/HistoricalResource.java index 5399b41c70a8..ec384606c6d8 100644 --- a/server/src/main/java/org/apache/druid/server/http/HistoricalResource.java +++ b/server/src/main/java/org/apache/druid/server/http/HistoricalResource.java @@ -21,10 +21,10 @@ import com.google.common.collect.ImmutableMap; import com.sun.jersey.spi.container.ResourceFilters; +import jakarta.inject.Inject; import org.apache.druid.server.coordination.SegmentCacheBootstrapper; import org.apache.druid.server.http.security.StateResourceFilter; -import jakarta.inject.Inject; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; diff --git a/server/src/test/java/org/apache/druid/guice/DruidInjectorBuilderTest.java b/server/src/test/java/org/apache/druid/guice/DruidInjectorBuilderTest.java index 9405c7838a50..dd1779636110 100644 --- a/server/src/test/java/org/apache/druid/guice/DruidInjectorBuilderTest.java +++ b/server/src/test/java/org/apache/druid/guice/DruidInjectorBuilderTest.java @@ -29,6 +29,7 @@ import com.google.inject.Binder; import com.google.inject.Injector; import com.google.inject.Key; +import jakarta.inject.Inject; import org.apache.druid.discovery.NodeRole; import org.apache.druid.guice.annotations.Json; import org.apache.druid.guice.annotations.LoadScope; @@ -36,8 +37,6 @@ import org.apache.druid.initialization.DruidModule; import org.apache.druid.java.util.common.ISE; import org.junit.Test; - -import jakarta.inject.Inject; import java.io.IOException; import java.util.Arrays; import java.util.List; diff --git a/services/src/main/java/org/apache/druid/cli/Version.java b/services/src/main/java/org/apache/druid/cli/Version.java index e594da1ed434..106c8a4a3dc6 100644 --- a/services/src/main/java/org/apache/druid/cli/Version.java +++ b/services/src/main/java/org/apache/druid/cli/Version.java @@ -21,12 +21,11 @@ import com.github.rvesse.airline.annotations.Command; import io.netty.util.SuppressForbidden; +import jakarta.inject.Inject; import org.apache.druid.guice.ExtensionsLoader; import org.apache.druid.server.StatusResource; import org.apache.druid.utils.RuntimeInfo; -import jakarta.inject.Inject; - @Command( name = "version", description = "Returns Druid version information" diff --git a/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaJsonHandler.java b/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaJsonHandler.java index b8df90a13eda..0e9dcfe12160 100644 --- a/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaJsonHandler.java +++ b/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaJsonHandler.java @@ -19,6 +19,7 @@ package org.apache.druid.sql.avatica; +import jakarta.inject.Inject; import org.apache.calcite.avatica.AvaticaUtils; import org.apache.calcite.avatica.metrics.Timer; import org.apache.calcite.avatica.remote.JsonHandler; @@ -34,7 +35,6 @@ import org.eclipse.jetty.server.Response; import org.eclipse.jetty.util.Callback; -import jakarta.inject.Inject; import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; diff --git a/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaProtobufHandler.java b/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaProtobufHandler.java index abc5fb42792d..6670e4aef069 100644 --- a/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaProtobufHandler.java +++ b/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaProtobufHandler.java @@ -19,6 +19,7 @@ package org.apache.druid.sql.avatica; +import jakarta.inject.Inject; import org.apache.calcite.avatica.AvaticaUtils; import org.apache.calcite.avatica.metrics.Timer; import org.apache.calcite.avatica.remote.ProtobufHandler; @@ -36,7 +37,6 @@ import org.eclipse.jetty.server.Response; import org.eclipse.jetty.util.Callback; -import jakarta.inject.Inject; import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/CountSqlAggregator.java b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/CountSqlAggregator.java index c2e5071c1439..1bc9fa4f46eb 100644 --- a/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/CountSqlAggregator.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/CountSqlAggregator.java @@ -21,6 +21,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; +import jakarta.inject.Inject; import org.apache.calcite.rel.core.AggregateCall; import org.apache.calcite.rex.RexBuilder; import org.apache.calcite.rex.RexNode; @@ -43,7 +44,6 @@ import org.apache.druid.sql.calcite.rel.VirtualColumnRegistry; import javax.annotation.Nullable; -import jakarta.inject.Inject; import java.util.List; public class CountSqlAggregator implements SqlAggregator diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/schema/DruidSchema.java b/sql/src/main/java/org/apache/druid/sql/calcite/schema/DruidSchema.java index 25c07fad3be1..dcfb9f4e9b3f 100644 --- a/sql/src/main/java/org/apache/druid/sql/calcite/schema/DruidSchema.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/schema/DruidSchema.java @@ -19,13 +19,12 @@ package org.apache.druid.sql.calcite.schema; +import jakarta.inject.Inject; import org.apache.calcite.schema.Table; import org.apache.druid.sql.calcite.planner.CatalogResolver; import org.apache.druid.sql.calcite.table.DatasourceTable; import org.apache.druid.sql.calcite.table.DruidTable; -import jakarta.inject.Inject; - import java.util.Set; public class DruidSchema extends AbstractTableSchema diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java b/sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java index 25dc0e20dc42..2559e4e0f619 100644 --- a/sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java @@ -28,6 +28,7 @@ import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.Provides; +import jakarta.inject.Named; import org.apache.druid.client.TestHttpClient; import org.apache.druid.client.TimelineServerView; import org.apache.druid.client.cache.Cache; @@ -126,7 +127,6 @@ import org.apache.druid.timeline.DataSegment; import org.apache.druid.utils.JvmUtils; -import jakarta.inject.Named; import java.io.Closeable; import java.io.File; import java.io.IOException; From 6659b935d88e51adae57dcb81cc79f140d467e3f Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 4 Feb 2026 12:20:21 +0000 Subject: [PATCH 06/15] remove --- multi-stage-query/pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/multi-stage-query/pom.xml b/multi-stage-query/pom.xml index 3e41d91a4b70..9b0cdb98f859 100644 --- a/multi-stage-query/pom.xml +++ b/multi-stage-query/pom.xml @@ -148,12 +148,6 @@ javax.servlet-api provided - - javax.inject - javax.inject - 1 - provided - com.sun.jersey jersey-server From 259c8ec1f28e2d150822871a1dd1118da108324d Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 4 Feb 2026 12:56:57 +0000 Subject: [PATCH 07/15] remove --- extensions-contrib/grpc-query/pom.xml | 6 ------ extensions-core/druid-catalog/pom.xml | 20 -------------------- 2 files changed, 26 deletions(-) diff --git a/extensions-contrib/grpc-query/pom.xml b/extensions-contrib/grpc-query/pom.xml index c430172e29fd..a116fbb923c2 100644 --- a/extensions-contrib/grpc-query/pom.xml +++ b/extensions-contrib/grpc-query/pom.xml @@ -200,12 +200,6 @@ calcite-core provided - - javax.inject - javax.inject - 1 - provided - diff --git a/extensions-core/druid-catalog/pom.xml b/extensions-core/druid-catalog/pom.xml index de0476b07a7a..e1a3bda82781 100644 --- a/extensions-core/druid-catalog/pom.xml +++ b/extensions-core/druid-catalog/pom.xml @@ -115,12 +115,6 @@ calcite-core provided - - javax.inject - javax.inject - 1 - provided - org.apache.curator curator-client @@ -266,20 +260,6 @@ - - org.apache.maven.plugins - maven-dependency-plugin - - - - javax.inject:javax.inject - - - javax.inject:javax.inject - jakarta.inject:jakarta.inject-api - - - From a69d7943dccbf8eb9c8e3fa1b0ff974b1a5fb5f6 Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 4 Feb 2026 12:58:53 +0000 Subject: [PATCH 08/15] forbid javax.inject --- codestyle/druid-forbidden-apis.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/codestyle/druid-forbidden-apis.txt b/codestyle/druid-forbidden-apis.txt index 6e6928e748b4..5b23f373d770 100644 --- a/codestyle/druid-forbidden-apis.txt +++ b/codestyle/druid-forbidden-apis.txt @@ -95,4 +95,5 @@ com.google.common.io.BaseEncoding#base64() javax.annotation.concurrent.GuardedBy com.amazonaws.annotation.GuardedBy +javax.inject.Inject @ jakarta.inject.Inject org.powermock.** @ Use Mockito instead of Powermock for compatibility with newer Java versions From 1ce03e20fc5cf193040ef7e9a8850ed9ccae4c93 Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 4 Feb 2026 15:46:25 +0000 Subject: [PATCH 09/15] undo jakarta migration; probably needs jersey upgrade --- codestyle/druid-forbidden-apis.txt | 1 - extensions-contrib/grpc-query/pom.xml | 6 ++++++ .../AnonymousAuthServerInterceptor.java | 3 ++- .../server/BasicAuthServerInterceptor.java | 3 ++- .../grpc/server/GrpcEndpointInitializer.java | 3 ++- extensions-core/druid-catalog/pom.xml | 20 +++++++++++++++++++ .../catalog/http/CatalogListenerResource.java | 2 +- .../druid/catalog/http/CatalogResource.java | 2 +- .../druid/catalog/storage/CatalogStorage.java | 2 +- .../storage/MetadataStorageManager.java | 3 ++- .../catalog/sync/CachedMetadataCatalog.java | 3 ++- .../druid/catalog/sync/CatalogClient.java | 2 +- .../catalog/sync/CatalogUpdateNotifier.java | 3 ++- .../catalog/sync/CatalogUpdateReceiver.java | 3 ++- .../catalog/sync/LocalMetadataCatalog.java | 3 ++- ...KubernetesTaskExecutionConfigResource.java | 2 +- .../WorkerTaskRunnerQueryAdapter.java | 3 ++- .../duty/KillUnreferencedIndexingState.java | 2 +- .../overlord/sampler/InputSourceSampler.java | 3 +-- multi-stage-query/pom.xml | 6 ++++++ .../catalog/sql/LiveCatalogResolver.java | 2 +- pom.xml | 6 ++++++ processing/pom.xml | 4 ++-- .../apache/druid/guice/ExtensionsLoader.java | 3 ++- .../apache/druid/guice/ExtensionsModule.java | 3 ++- .../query/expression/GuiceExprMacroTable.java | 2 +- .../expression/NestedDataExpressions.java | 2 +- .../GroupByResourcesReservationPool.java | 2 +- .../druid/quidem/QuidemCaptureResource.java | 2 +- server/pom.xml | 5 +++++ .../catalog/model/TableDefnRegistry.java | 2 +- .../apache/druid/server/StatusResource.java | 2 +- .../CoordinatorDynamicConfigsResource.java | 2 +- .../druid/server/http/HistoricalResource.java | 2 +- .../druid/guice/DruidInjectorBuilderTest.java | 3 ++- .../java/org/apache/druid/cli/Version.java | 3 ++- .../sql/avatica/DruidAvaticaJsonHandler.java | 2 +- .../avatica/DruidAvaticaProtobufHandler.java | 2 +- .../builtin/CountSqlAggregator.java | 2 +- .../druid/sql/calcite/schema/DruidSchema.java | 3 ++- .../sql/calcite/util/SqlTestFramework.java | 2 +- 41 files changed, 93 insertions(+), 38 deletions(-) diff --git a/codestyle/druid-forbidden-apis.txt b/codestyle/druid-forbidden-apis.txt index 5b23f373d770..6e6928e748b4 100644 --- a/codestyle/druid-forbidden-apis.txt +++ b/codestyle/druid-forbidden-apis.txt @@ -95,5 +95,4 @@ com.google.common.io.BaseEncoding#base64() javax.annotation.concurrent.GuardedBy com.amazonaws.annotation.GuardedBy -javax.inject.Inject @ jakarta.inject.Inject org.powermock.** @ Use Mockito instead of Powermock for compatibility with newer Java versions diff --git a/extensions-contrib/grpc-query/pom.xml b/extensions-contrib/grpc-query/pom.xml index a116fbb923c2..c430172e29fd 100644 --- a/extensions-contrib/grpc-query/pom.xml +++ b/extensions-contrib/grpc-query/pom.xml @@ -200,6 +200,12 @@ calcite-core provided + + javax.inject + javax.inject + 1 + provided + diff --git a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/AnonymousAuthServerInterceptor.java b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/AnonymousAuthServerInterceptor.java index 4543871862bb..3059c603d479 100644 --- a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/AnonymousAuthServerInterceptor.java +++ b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/AnonymousAuthServerInterceptor.java @@ -27,9 +27,10 @@ import io.grpc.ServerCall.Listener; import io.grpc.ServerCallHandler; import io.grpc.ServerInterceptor; -import jakarta.inject.Inject; import org.apache.druid.server.security.Authenticator; +import javax.inject.Inject; + /** * "Authorizes" an anonymous request, which just means adding an "allow all" * authorization result in the context. Use this form for either of Druid's diff --git a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/BasicAuthServerInterceptor.java b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/BasicAuthServerInterceptor.java index 4cd2ffeb902b..15a4926e2099 100644 --- a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/BasicAuthServerInterceptor.java +++ b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/BasicAuthServerInterceptor.java @@ -29,12 +29,13 @@ import io.grpc.ServerInterceptor; import io.grpc.Status; import io.grpc.StatusRuntimeException; -import jakarta.inject.Inject; import org.apache.druid.java.util.common.StringUtils; import org.apache.druid.java.util.common.logger.Logger; import org.apache.druid.server.security.AuthenticationResult; import org.apache.druid.server.security.Authenticator; +import javax.inject.Inject; + /** * Authorizes a Basic Auth user name and password and sets the resulting * {@link AuthenticationResult} on the call context. diff --git a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/GrpcEndpointInitializer.java b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/GrpcEndpointInitializer.java index d53f95b950e9..68a67e3bc786 100644 --- a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/GrpcEndpointInitializer.java +++ b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/GrpcEndpointInitializer.java @@ -20,7 +20,6 @@ package org.apache.druid.grpc.server; import com.fasterxml.jackson.databind.ObjectMapper; -import jakarta.inject.Inject; import org.apache.druid.guice.ManageLifecycleServer; import org.apache.druid.guice.annotations.Json; import org.apache.druid.guice.annotations.NativeQuery; @@ -33,6 +32,8 @@ import org.apache.druid.server.security.AuthenticatorMapper; import org.apache.druid.sql.SqlStatementFactory; +import javax.inject.Inject; + import java.io.IOException; /** diff --git a/extensions-core/druid-catalog/pom.xml b/extensions-core/druid-catalog/pom.xml index e1a3bda82781..de0476b07a7a 100644 --- a/extensions-core/druid-catalog/pom.xml +++ b/extensions-core/druid-catalog/pom.xml @@ -115,6 +115,12 @@ calcite-core provided + + javax.inject + javax.inject + 1 + provided + org.apache.curator curator-client @@ -260,6 +266,20 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + + javax.inject:javax.inject + + + javax.inject:javax.inject + jakarta.inject:jakarta.inject-api + + + diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogListenerResource.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogListenerResource.java index c63374d381b4..c100fbbbad82 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogListenerResource.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogListenerResource.java @@ -21,11 +21,11 @@ import com.fasterxml.jackson.jaxrs.smile.SmileMediaTypes; import com.sun.jersey.spi.container.ResourceFilters; -import jakarta.inject.Inject; import org.apache.druid.catalog.sync.CatalogUpdateListener; import org.apache.druid.catalog.sync.UpdateEvent; import org.apache.druid.server.http.security.ConfigResourceFilter; +import javax.inject.Inject; import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogResource.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogResource.java index db89935554e7..a766b86caec6 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogResource.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogResource.java @@ -22,7 +22,6 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import jakarta.inject.Inject; import org.apache.druid.catalog.CatalogException; import org.apache.druid.catalog.CatalogException.DuplicateKeyException; import org.apache.druid.catalog.CatalogException.NotFoundException; @@ -44,6 +43,7 @@ import org.apache.druid.server.security.ResourceAction; import org.apache.druid.server.security.ResourceType; +import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/CatalogStorage.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/CatalogStorage.java index 126ff8cfe7e3..a0c623ba46b7 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/CatalogStorage.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/CatalogStorage.java @@ -20,7 +20,6 @@ package org.apache.druid.catalog.storage; import com.fasterxml.jackson.databind.ObjectMapper; -import jakarta.inject.Inject; import org.apache.druid.catalog.CatalogException.NotFoundException; import org.apache.druid.catalog.model.ResolvedTable; import org.apache.druid.catalog.model.SchemaRegistry; @@ -36,6 +35,7 @@ import org.apache.druid.guice.annotations.Json; import javax.annotation.Nullable; +import javax.inject.Inject; import java.util.List; /** diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/MetadataStorageManager.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/MetadataStorageManager.java index 0febb07d71ac..b5c7173698ee 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/MetadataStorageManager.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/MetadataStorageManager.java @@ -21,13 +21,14 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Supplier; -import jakarta.inject.Inject; import org.apache.druid.guice.annotations.Json; import org.apache.druid.metadata.MetadataStorageConnector; import org.apache.druid.metadata.MetadataStorageConnectorConfig; import org.apache.druid.metadata.MetadataStorageTablesConfig; import org.apache.druid.metadata.SQLMetadataConnector; +import javax.inject.Inject; + /** * Represents the metastore manager database and its implementation. * Abstracts away the various kick-knacks used to define the metastore. diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CachedMetadataCatalog.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CachedMetadataCatalog.java index 53e8d32a87e5..e164bcd06414 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CachedMetadataCatalog.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CachedMetadataCatalog.java @@ -20,7 +20,6 @@ package org.apache.druid.catalog.sync; import com.fasterxml.jackson.databind.ObjectMapper; -import jakarta.inject.Inject; import org.apache.druid.catalog.MetadataCatalog; import org.apache.druid.catalog.model.ResolvedTable; import org.apache.druid.catalog.model.SchemaRegistry; @@ -30,6 +29,8 @@ import org.apache.druid.catalog.model.TableMetadata; import org.apache.druid.guice.annotations.Json; import org.apache.druid.java.util.common.logger.Logger; + +import javax.inject.Inject; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogClient.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogClient.java index 07e377b7d805..1c3a2be487b7 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogClient.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogClient.java @@ -22,7 +22,6 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.util.concurrent.ListenableFuture; -import jakarta.inject.Inject; import org.apache.druid.catalog.http.CatalogResource; import org.apache.druid.catalog.model.ResolvedTable; import org.apache.druid.catalog.model.TableDefnRegistry; @@ -46,6 +45,7 @@ import org.jboss.netty.handler.codec.http.HttpMethod; import javax.annotation.Nullable; +import javax.inject.Inject; import java.util.Collections; import java.util.List; diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateNotifier.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateNotifier.java index 3b462f63d4e2..b91cf6d3ea0d 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateNotifier.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateNotifier.java @@ -21,7 +21,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; -import jakarta.inject.Inject; import org.apache.druid.catalog.http.CatalogListenerResource; import org.apache.druid.catalog.storage.CatalogStorage; import org.apache.druid.catalog.sync.RestUpdateSender.RestSender; @@ -37,6 +36,8 @@ import org.apache.druid.java.util.http.client.HttpClient; import org.apache.druid.server.DruidNode; import org.joda.time.Duration; + +import javax.inject.Inject; import java.util.function.Supplier; /** diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateReceiver.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateReceiver.java index ef79c62421ff..61cfa56d2098 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateReceiver.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogUpdateReceiver.java @@ -19,7 +19,6 @@ package org.apache.druid.catalog.sync; -import jakarta.inject.Inject; import org.apache.druid.concurrent.LifecycleLock; import org.apache.druid.guice.ManageLifecycle; import org.apache.druid.java.util.common.ISE; @@ -30,6 +29,8 @@ import org.apache.druid.java.util.common.lifecycle.LifecycleStop; import org.apache.druid.java.util.emitter.EmittingLogger; import org.joda.time.Duration; + +import javax.inject.Inject; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadLocalRandom; diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/LocalMetadataCatalog.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/LocalMetadataCatalog.java index b8cdfbbf0590..94e9ff1128a4 100644 --- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/LocalMetadataCatalog.java +++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/LocalMetadataCatalog.java @@ -19,13 +19,14 @@ package org.apache.druid.catalog.sync; -import jakarta.inject.Inject; import org.apache.druid.catalog.MetadataCatalog; import org.apache.druid.catalog.model.ResolvedTable; import org.apache.druid.catalog.model.SchemaRegistry; import org.apache.druid.catalog.model.SchemaRegistry.SchemaSpec; import org.apache.druid.catalog.model.TableId; import org.apache.druid.catalog.model.TableMetadata; + +import javax.inject.Inject; import java.util.Collections; import java.util.HashSet; import java.util.List; diff --git a/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskExecutionConfigResource.java b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskExecutionConfigResource.java index 4c12e4469afb..432a41933ede 100644 --- a/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskExecutionConfigResource.java +++ b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskExecutionConfigResource.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableMap; import com.sun.jersey.spi.container.ResourceFilters; -import jakarta.inject.Inject; import org.apache.druid.audit.AuditEntry; import org.apache.druid.audit.AuditManager; import org.apache.druid.common.config.ConfigManager; @@ -32,6 +31,7 @@ import org.apache.druid.server.security.AuthorizationUtils; import org.joda.time.Interval; +import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; import javax.ws.rs.GET; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/WorkerTaskRunnerQueryAdapter.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/WorkerTaskRunnerQueryAdapter.java index e3bcbe5fd93e..362a832c80ac 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/WorkerTaskRunnerQueryAdapter.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/WorkerTaskRunnerQueryAdapter.java @@ -23,7 +23,6 @@ import com.google.common.base.Throwables; import com.google.common.collect.Iterables; import io.netty.handler.timeout.TimeoutException; -import jakarta.inject.Inject; import org.apache.druid.guice.annotations.EscalatedGlobal; import org.apache.druid.indexing.overlord.hrtr.HttpRemoteTaskRunner; import org.apache.druid.java.util.common.RE; @@ -34,6 +33,8 @@ import org.apache.druid.java.util.http.client.response.StatusResponseHolder; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpResponseStatus; + +import javax.inject.Inject; import java.net.URL; import java.util.concurrent.ExecutionException; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/duty/KillUnreferencedIndexingState.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/duty/KillUnreferencedIndexingState.java index f43125278209..a00688b6ea22 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/duty/KillUnreferencedIndexingState.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/duty/KillUnreferencedIndexingState.java @@ -19,12 +19,12 @@ package org.apache.druid.indexing.overlord.duty; -import jakarta.inject.Inject; import org.apache.druid.indexing.overlord.config.IndexingStateCleanupConfig; import org.apache.druid.java.util.common.logger.Logger; import org.apache.druid.segment.metadata.IndexingStateStorage; import org.joda.time.DateTime; +import javax.inject.Inject; import java.util.List; /** diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/InputSourceSampler.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/InputSourceSampler.java index 0827df6b1d82..5541fb1374b9 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/InputSourceSampler.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/InputSourceSampler.java @@ -21,7 +21,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; -import jakarta.inject.Inject; import org.apache.commons.lang3.ArrayUtils; import org.apache.druid.client.indexing.SamplerResponse; import org.apache.druid.client.indexing.SamplerResponse.SamplerResponseRow; @@ -55,7 +54,7 @@ import org.apache.druid.segment.indexing.DataSchema; import javax.annotation.Nullable; - +import javax.inject.Inject; import java.io.File; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/multi-stage-query/pom.xml b/multi-stage-query/pom.xml index 9b0cdb98f859..3e41d91a4b70 100644 --- a/multi-stage-query/pom.xml +++ b/multi-stage-query/pom.xml @@ -148,6 +148,12 @@ javax.servlet-api provided + + javax.inject + javax.inject + 1 + provided + com.sun.jersey jersey-server diff --git a/multi-stage-query/src/main/java/org/apache/druid/catalog/sql/LiveCatalogResolver.java b/multi-stage-query/src/main/java/org/apache/druid/catalog/sql/LiveCatalogResolver.java index 38d078343f83..0e010a521685 100644 --- a/multi-stage-query/src/main/java/org/apache/druid/catalog/sql/LiveCatalogResolver.java +++ b/multi-stage-query/src/main/java/org/apache/druid/catalog/sql/LiveCatalogResolver.java @@ -20,7 +20,6 @@ package org.apache.druid.catalog.sql; import com.google.common.collect.ImmutableSet; -import jakarta.inject.Inject; import org.apache.druid.catalog.MetadataCatalog; import org.apache.druid.catalog.model.ColumnSpec; import org.apache.druid.catalog.model.Columns; @@ -39,6 +38,7 @@ import org.apache.druid.sql.calcite.table.DruidTable; import javax.annotation.Nullable; +import javax.inject.Inject; import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/pom.xml b/pom.xml index dafa61a54f4f..e2de516554f1 100644 --- a/pom.xml +++ b/pom.xml @@ -642,6 +642,12 @@ jakarta.inject-api 2.0.1 + + javax.inject + javax.inject + 1 + provided + javax.el javax.el-api diff --git a/processing/pom.xml b/processing/pom.xml index 8896557f786f..eb74e83d0600 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -108,8 +108,8 @@ error_prone_annotations - jakarta.inject - jakarta.inject-api + javax.inject + javax.inject jakarta.validation diff --git a/processing/src/main/java/org/apache/druid/guice/ExtensionsLoader.java b/processing/src/main/java/org/apache/druid/guice/ExtensionsLoader.java index ecc17fdacd3e..cae76196b53c 100644 --- a/processing/src/main/java/org/apache/druid/guice/ExtensionsLoader.java +++ b/processing/src/main/java/org/apache/druid/guice/ExtensionsLoader.java @@ -24,7 +24,6 @@ import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.concurrent.GuardedBy; import com.google.inject.Injector; -import jakarta.inject.Inject; import org.apache.commons.io.FileUtils; import org.apache.druid.initialization.DruidModule; import org.apache.druid.java.util.common.ISE; @@ -33,6 +32,8 @@ import org.apache.druid.java.util.common.StringUtils; import org.apache.druid.java.util.common.logger.Logger; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; + +import javax.inject.Inject; import java.io.File; import java.io.FilenameFilter; import java.io.IOException; diff --git a/processing/src/main/java/org/apache/druid/guice/ExtensionsModule.java b/processing/src/main/java/org/apache/druid/guice/ExtensionsModule.java index 5654b2533ff2..54010d3bd186 100644 --- a/processing/src/main/java/org/apache/druid/guice/ExtensionsModule.java +++ b/processing/src/main/java/org/apache/druid/guice/ExtensionsModule.java @@ -21,7 +21,8 @@ import com.google.inject.Binder; import com.google.inject.Module; -import jakarta.inject.Inject; + +import javax.inject.Inject; /** * Module for the extensions loader. Add to the startup injector diff --git a/processing/src/main/java/org/apache/druid/query/expression/GuiceExprMacroTable.java b/processing/src/main/java/org/apache/druid/query/expression/GuiceExprMacroTable.java index 5fcc2bbed6ec..ce05debcf6d4 100644 --- a/processing/src/main/java/org/apache/druid/query/expression/GuiceExprMacroTable.java +++ b/processing/src/main/java/org/apache/druid/query/expression/GuiceExprMacroTable.java @@ -20,9 +20,9 @@ package org.apache.druid.query.expression; import com.google.common.collect.ImmutableList; -import jakarta.inject.Inject; import org.apache.druid.math.expr.ExprMacroTable; +import javax.inject.Inject; import java.util.Set; public class GuiceExprMacroTable extends ExprMacroTable diff --git a/processing/src/main/java/org/apache/druid/query/expression/NestedDataExpressions.java b/processing/src/main/java/org/apache/druid/query/expression/NestedDataExpressions.java index 4ca58e49a447..a3a59d36adf8 100644 --- a/processing/src/main/java/org/apache/druid/query/expression/NestedDataExpressions.java +++ b/processing/src/main/java/org/apache/druid/query/expression/NestedDataExpressions.java @@ -22,7 +22,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import jakarta.inject.Inject; import org.apache.druid.error.DruidException; import org.apache.druid.guice.annotations.Json; import org.apache.druid.math.expr.Expr; @@ -38,6 +37,7 @@ import org.apache.druid.segment.nested.StructuredDataProcessor; import javax.annotation.Nullable; +import javax.inject.Inject; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; diff --git a/processing/src/main/java/org/apache/druid/query/groupby/GroupByResourcesReservationPool.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupByResourcesReservationPool.java index fb55f5203a02..bd585dc7218c 100644 --- a/processing/src/main/java/org/apache/druid/query/groupby/GroupByResourcesReservationPool.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupByResourcesReservationPool.java @@ -19,13 +19,13 @@ package org.apache.druid.query.groupby; -import jakarta.inject.Inject; import org.apache.druid.collections.BlockingPool; import org.apache.druid.error.DruidException; import org.apache.druid.guice.annotations.Merging; import org.apache.druid.query.QueryResourceId; import javax.annotation.Nullable; +import javax.inject.Inject; import java.nio.ByteBuffer; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; diff --git a/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemCaptureResource.java b/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemCaptureResource.java index 3254090a775d..68d2f31ac81a 100644 --- a/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemCaptureResource.java +++ b/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemCaptureResource.java @@ -20,11 +20,11 @@ package org.apache.druid.quidem; import com.google.inject.Inject; -import jakarta.inject.Named; import org.apache.druid.guice.LazySingleton; import org.apache.druid.java.util.common.StringUtils; import org.apache.druid.sql.hook.DruidHookDispatcher; +import javax.inject.Named; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; diff --git a/server/pom.xml b/server/pom.xml index 319e129173b1..ac42aa1ebf7d 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -325,6 +325,11 @@ org.apache.commons commons-lang3 + + javax.inject + javax.inject + + diff --git a/server/src/main/java/org/apache/druid/catalog/model/TableDefnRegistry.java b/server/src/main/java/org/apache/druid/catalog/model/TableDefnRegistry.java index 8cdfd0b62d82..1a14d7403937 100644 --- a/server/src/main/java/org/apache/druid/catalog/model/TableDefnRegistry.java +++ b/server/src/main/java/org/apache/druid/catalog/model/TableDefnRegistry.java @@ -22,7 +22,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; -import jakarta.inject.Inject; import org.apache.druid.catalog.model.table.DatasourceDefn; import org.apache.druid.catalog.model.table.ExternalTableDefn; import org.apache.druid.catalog.model.table.HttpInputSourceDefn; @@ -35,6 +34,7 @@ import org.apache.druid.java.util.common.IAE; import javax.annotation.Nullable; +import javax.inject.Inject; import java.util.Arrays; import java.util.List; import java.util.Map; diff --git a/server/src/main/java/org/apache/druid/server/StatusResource.java b/server/src/main/java/org/apache/druid/server/StatusResource.java index c5bed1501af8..29aaae98c257 100644 --- a/server/src/main/java/org/apache/druid/server/StatusResource.java +++ b/server/src/main/java/org/apache/druid/server/StatusResource.java @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Maps; import com.sun.jersey.spi.container.ResourceFilters; -import jakarta.inject.Inject; import org.apache.druid.client.DruidServerConfig; import org.apache.druid.common.guava.GuavaUtils; import org.apache.druid.guice.ExtensionsLoader; @@ -34,6 +33,7 @@ import org.apache.druid.utils.RuntimeInfo; import javax.annotation.Nonnull; +import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/server/src/main/java/org/apache/druid/server/http/CoordinatorDynamicConfigsResource.java b/server/src/main/java/org/apache/druid/server/http/CoordinatorDynamicConfigsResource.java index 3aa06097fe8b..93feb328a8c2 100644 --- a/server/src/main/java/org/apache/druid/server/http/CoordinatorDynamicConfigsResource.java +++ b/server/src/main/java/org/apache/druid/server/http/CoordinatorDynamicConfigsResource.java @@ -20,7 +20,6 @@ package org.apache.druid.server.http; import com.sun.jersey.spi.container.ResourceFilters; -import jakarta.inject.Inject; import org.apache.druid.audit.AuditManager; import org.apache.druid.common.config.ConfigManager.SetResult; import org.apache.druid.java.util.common.Intervals; @@ -34,6 +33,7 @@ import org.joda.time.Interval; import javax.annotation.Nullable; +import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; import javax.ws.rs.GET; diff --git a/server/src/main/java/org/apache/druid/server/http/HistoricalResource.java b/server/src/main/java/org/apache/druid/server/http/HistoricalResource.java index ec384606c6d8..8a049fa4d8e9 100644 --- a/server/src/main/java/org/apache/druid/server/http/HistoricalResource.java +++ b/server/src/main/java/org/apache/druid/server/http/HistoricalResource.java @@ -21,10 +21,10 @@ import com.google.common.collect.ImmutableMap; import com.sun.jersey.spi.container.ResourceFilters; -import jakarta.inject.Inject; import org.apache.druid.server.coordination.SegmentCacheBootstrapper; import org.apache.druid.server.http.security.StateResourceFilter; +import javax.inject.Inject; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; diff --git a/server/src/test/java/org/apache/druid/guice/DruidInjectorBuilderTest.java b/server/src/test/java/org/apache/druid/guice/DruidInjectorBuilderTest.java index dd1779636110..d55ebe8f16b1 100644 --- a/server/src/test/java/org/apache/druid/guice/DruidInjectorBuilderTest.java +++ b/server/src/test/java/org/apache/druid/guice/DruidInjectorBuilderTest.java @@ -29,7 +29,6 @@ import com.google.inject.Binder; import com.google.inject.Injector; import com.google.inject.Key; -import jakarta.inject.Inject; import org.apache.druid.discovery.NodeRole; import org.apache.druid.guice.annotations.Json; import org.apache.druid.guice.annotations.LoadScope; @@ -37,6 +36,8 @@ import org.apache.druid.initialization.DruidModule; import org.apache.druid.java.util.common.ISE; import org.junit.Test; + +import javax.inject.Inject; import java.io.IOException; import java.util.Arrays; import java.util.List; diff --git a/services/src/main/java/org/apache/druid/cli/Version.java b/services/src/main/java/org/apache/druid/cli/Version.java index 106c8a4a3dc6..677c4d9da769 100644 --- a/services/src/main/java/org/apache/druid/cli/Version.java +++ b/services/src/main/java/org/apache/druid/cli/Version.java @@ -21,11 +21,12 @@ import com.github.rvesse.airline.annotations.Command; import io.netty.util.SuppressForbidden; -import jakarta.inject.Inject; import org.apache.druid.guice.ExtensionsLoader; import org.apache.druid.server.StatusResource; import org.apache.druid.utils.RuntimeInfo; +import javax.inject.Inject; + @Command( name = "version", description = "Returns Druid version information" diff --git a/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaJsonHandler.java b/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaJsonHandler.java index 0e9dcfe12160..f6d0738e2321 100644 --- a/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaJsonHandler.java +++ b/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaJsonHandler.java @@ -19,7 +19,6 @@ package org.apache.druid.sql.avatica; -import jakarta.inject.Inject; import org.apache.calcite.avatica.AvaticaUtils; import org.apache.calcite.avatica.metrics.Timer; import org.apache.calcite.avatica.remote.JsonHandler; @@ -35,6 +34,7 @@ import org.eclipse.jetty.server.Response; import org.eclipse.jetty.util.Callback; +import javax.inject.Inject; import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; diff --git a/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaProtobufHandler.java b/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaProtobufHandler.java index 6670e4aef069..7d5c6183025a 100644 --- a/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaProtobufHandler.java +++ b/sql/src/main/java/org/apache/druid/sql/avatica/DruidAvaticaProtobufHandler.java @@ -19,7 +19,6 @@ package org.apache.druid.sql.avatica; -import jakarta.inject.Inject; import org.apache.calcite.avatica.AvaticaUtils; import org.apache.calcite.avatica.metrics.Timer; import org.apache.calcite.avatica.remote.ProtobufHandler; @@ -37,6 +36,7 @@ import org.eclipse.jetty.server.Response; import org.eclipse.jetty.util.Callback; +import javax.inject.Inject; import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/CountSqlAggregator.java b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/CountSqlAggregator.java index 1bc9fa4f46eb..572d276a0bd3 100644 --- a/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/CountSqlAggregator.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/CountSqlAggregator.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import jakarta.inject.Inject; import org.apache.calcite.rel.core.AggregateCall; import org.apache.calcite.rex.RexBuilder; import org.apache.calcite.rex.RexNode; @@ -44,6 +43,7 @@ import org.apache.druid.sql.calcite.rel.VirtualColumnRegistry; import javax.annotation.Nullable; +import javax.inject.Inject; import java.util.List; public class CountSqlAggregator implements SqlAggregator diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/schema/DruidSchema.java b/sql/src/main/java/org/apache/druid/sql/calcite/schema/DruidSchema.java index dcfb9f4e9b3f..96cd166b1565 100644 --- a/sql/src/main/java/org/apache/druid/sql/calcite/schema/DruidSchema.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/schema/DruidSchema.java @@ -19,12 +19,13 @@ package org.apache.druid.sql.calcite.schema; -import jakarta.inject.Inject; import org.apache.calcite.schema.Table; import org.apache.druid.sql.calcite.planner.CatalogResolver; import org.apache.druid.sql.calcite.table.DatasourceTable; import org.apache.druid.sql.calcite.table.DruidTable; +import javax.inject.Inject; + import java.util.Set; public class DruidSchema extends AbstractTableSchema diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java b/sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java index 2559e4e0f619..607b159ad8f2 100644 --- a/sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java @@ -28,7 +28,6 @@ import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.Provides; -import jakarta.inject.Named; import org.apache.druid.client.TestHttpClient; import org.apache.druid.client.TimelineServerView; import org.apache.druid.client.cache.Cache; @@ -127,6 +126,7 @@ import org.apache.druid.timeline.DataSegment; import org.apache.druid.utils.JvmUtils; +import javax.inject.Named; import java.io.Closeable; import java.io.File; import java.io.IOException; From e2d67c4fe7556c49ae08c2a079f45262276409d4 Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 4 Feb 2026 15:55:11 +0000 Subject: [PATCH 10/15] try --- indexing-service/pom.xml | 4 ++-- server/pom.xml | 5 ----- sql/pom.xml | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index f95129baaaa7..3b21a710fb95 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -72,8 +72,8 @@ joda-time - jakarta.inject - jakarta.inject-api + javax.inject + javax.inject com.google.inject diff --git a/server/pom.xml b/server/pom.xml index ac42aa1ebf7d..0b77b2f29508 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -54,11 +54,6 @@ google-http-client runtime - - - jakarta.inject - jakarta.inject-api - org.apache.zookeeper zookeeper diff --git a/sql/pom.xml b/sql/pom.xml index e083043f732f..ea4556304298 100644 --- a/sql/pom.xml +++ b/sql/pom.xml @@ -126,6 +126,7 @@ com.fasterxml.jackson.core jackson-annotations + jakarta.inject jakarta.inject-api From b512c146181c7000e83f6638f04179c85c673b1c Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 4 Feb 2026 15:55:14 +0000 Subject: [PATCH 11/15] Revert "try" This reverts commit e2d67c4fe7556c49ae08c2a079f45262276409d4. --- indexing-service/pom.xml | 4 ++-- server/pom.xml | 5 +++++ sql/pom.xml | 1 - 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 3b21a710fb95..f95129baaaa7 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -72,8 +72,8 @@ joda-time - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api com.google.inject diff --git a/server/pom.xml b/server/pom.xml index 0b77b2f29508..ac42aa1ebf7d 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -54,6 +54,11 @@ google-http-client runtime + + + jakarta.inject + jakarta.inject-api + org.apache.zookeeper zookeeper diff --git a/sql/pom.xml b/sql/pom.xml index ea4556304298..e083043f732f 100644 --- a/sql/pom.xml +++ b/sql/pom.xml @@ -126,7 +126,6 @@ com.fasterxml.jackson.core jackson-annotations - jakarta.inject jakarta.inject-api From cbb220c7cde3e652bb5d321960479c4384c36e8f Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 4 Feb 2026 15:57:16 +0000 Subject: [PATCH 12/15] we-are-using-this --- indexing-service/pom.xml | 4 ++-- server/pom.xml | 5 ----- sql/pom.xml | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index f95129baaaa7..3b21a710fb95 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -72,8 +72,8 @@ joda-time - jakarta.inject - jakarta.inject-api + javax.inject + javax.inject com.google.inject diff --git a/server/pom.xml b/server/pom.xml index ac42aa1ebf7d..0b77b2f29508 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -54,11 +54,6 @@ google-http-client runtime - - - jakarta.inject - jakarta.inject-api - org.apache.zookeeper zookeeper diff --git a/sql/pom.xml b/sql/pom.xml index e083043f732f..ea4556304298 100644 --- a/sql/pom.xml +++ b/sql/pom.xml @@ -126,6 +126,7 @@ com.fasterxml.jackson.core jackson-annotations + jakarta.inject jakarta.inject-api From 4defc694fcf31c3d58c10c4cbb80fe9429400fe5 Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 4 Feb 2026 16:03:25 +0000 Subject: [PATCH 13/15] updates --- extensions-core/druid-catalog/pom.xml | 14 -------------- extensions-core/kubernetes-extensions/pom.xml | 4 ++++ .../kubernetes-overlord-extensions/pom.xml | 4 ++++ services/pom.xml | 4 ++++ sql/pom.xml | 4 ++-- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/extensions-core/druid-catalog/pom.xml b/extensions-core/druid-catalog/pom.xml index de0476b07a7a..f2a5ba83a3ff 100644 --- a/extensions-core/druid-catalog/pom.xml +++ b/extensions-core/druid-catalog/pom.xml @@ -266,20 +266,6 @@ - - org.apache.maven.plugins - maven-dependency-plugin - - - - javax.inject:javax.inject - - - javax.inject:javax.inject - jakarta.inject:jakarta.inject-api - - - diff --git a/extensions-core/kubernetes-extensions/pom.xml b/extensions-core/kubernetes-extensions/pom.xml index 9b80d9bb129d..362f32917942 100644 --- a/extensions-core/kubernetes-extensions/pom.xml +++ b/extensions-core/kubernetes-extensions/pom.xml @@ -99,6 +99,10 @@ jsr305 provided + + javax.inject + javax.inject + com.google.inject guice diff --git a/extensions-core/kubernetes-overlord-extensions/pom.xml b/extensions-core/kubernetes-overlord-extensions/pom.xml index b42de19cea53..61698bd3c3f9 100644 --- a/extensions-core/kubernetes-overlord-extensions/pom.xml +++ b/extensions-core/kubernetes-overlord-extensions/pom.xml @@ -212,6 +212,10 @@ jsr305 provided + + javax.inject + javax.inject + com.google.inject guice diff --git a/services/pom.xml b/services/pom.xml index 1cec8c5307ff..79cdd015d491 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -114,6 +114,10 @@ joda-time joda-time + + javax.inject + javax.inject + com.google.inject guice diff --git a/sql/pom.xml b/sql/pom.xml index ea4556304298..d500a06b47af 100644 --- a/sql/pom.xml +++ b/sql/pom.xml @@ -128,8 +128,8 @@ - jakarta.inject - jakarta.inject-api + javax.inject + javax.inject com.google.inject From 165423a7373288efa74fd5c529ddede668746fce Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 4 Feb 2026 17:20:50 +0000 Subject: [PATCH 14/15] remove-prov --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index e2de516554f1..ac2e1dfed1bb 100644 --- a/pom.xml +++ b/pom.xml @@ -646,7 +646,6 @@ javax.inject javax.inject 1 - provided javax.el From 3b94b96df8abd822c9bac4ffc313fd29191ed9fa Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 4 Feb 2026 19:55:47 +0000 Subject: [PATCH 15/15] fix --- extensions-core/kubernetes-extensions/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/extensions-core/kubernetes-extensions/pom.xml b/extensions-core/kubernetes-extensions/pom.xml index 362f32917942..9b80d9bb129d 100644 --- a/extensions-core/kubernetes-extensions/pom.xml +++ b/extensions-core/kubernetes-extensions/pom.xml @@ -99,10 +99,6 @@ jsr305 provided - - javax.inject - javax.inject - com.google.inject guice