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-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/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/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: diff --git a/pom.xml b/pom.xml index 9a3b125e683c..ac2e1dfed1bb 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,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 @@ -640,7 +640,12 @@ jakarta.inject jakarta.inject-api - 1.0.3 + 2.0.1 + + + javax.inject + javax.inject + 1 javax.el @@ -1023,12 +1028,12 @@ org.ow2.asm asm - 9.8 + 9.9.1 org.ow2.asm asm-commons - 9.8 + 9.9.1 org.asynchttpclient 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..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 @@ -321,10 +316,15 @@ com.fasterxml.jackson.module jackson-module-guice - + org.apache.commons commons-lang3 - + + + javax.inject + javax.inject + + 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 e083043f732f..d500a06b47af 100644 --- a/sql/pom.xml +++ b/sql/pom.xml @@ -126,9 +126,10 @@ com.fasterxml.jackson.core jackson-annotations + - jakarta.inject - jakarta.inject-api + javax.inject + javax.inject com.google.inject