diff options
26 files changed, 51 insertions, 30 deletions
diff --git a/application/pom.xml b/application/pom.xml index 4e5e2f6ba9f..bbb4b171676 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -110,6 +110,10 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-math3</artifactId> </dependency> + <dependency> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> + </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 13ae492250f..8871b8ac55a 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -54,7 +54,7 @@ <include>com.google.guava:failureaccess:[1.0.1, 2):provided</include> <include>com.google.j2objc:j2objc-annotations:[2.8, 3):provided</include> - <include>com.google.inject:guice:jar:no_aop:${guice.vespa.version}:provided</include> + <include>com.google.inject:guice:jar:${guice.vespa.version}:provided</include> <include>com.sun.activation:javax.activation:[1.2.0, 2):provided</include> <include>com.sun.xml.bind:jaxb-core:${jaxb-core.vespa.version}:provided</include> <include>com.sun.xml.bind:jaxb-impl:${jaxb-impl.vespa.version}:provided</include> @@ -149,6 +149,7 @@ <include>io.prometheus:simpleclient_tracer_common:${prometheus.client.vespa.version}:test</include> <include>io.prometheus:simpleclient_tracer_otel:${prometheus.client.vespa.version}:test</include> <include>io.prometheus:simpleclient_tracer_otel_agent:${prometheus.client.vespa.version}:test</include> + <include>jakarta.inject:jakarta.inject-api:${jakarta.inject.vespa.version}:test</include> <include>junit:junit:${junit4.vespa.version}:test</include> <include>net.java.dev.jna:jna:${jna.vespa.version}:test</include> <include>net.openhft:zero-allocation-hashing:jar:${zero-allocation-hashing.vespa.version}:test</include> diff --git a/config-model-fat/pom.xml b/config-model-fat/pom.xml index 85edae6b6a1..55592897447 100644 --- a/config-model-fat/pom.xml +++ b/config-model-fat/pom.xml @@ -189,7 +189,7 @@ <i>com.google.errorprone:error_prone_annotations:*:*</i> <i>com.google.guava:failureaccess:*:*</i> <i>com.google.guava:guava:*:*</i> - <i>com.google.inject:guice:jar:no_aop:*:*</i> + <i>com.google.inject:guice:jar:*:*</i> <i>com.google.j2objc:j2objc-annotations:*:*</i> <i>com.google.protobuf:protobuf-java:*:*</i> <i>com.sun.activation:javax.activation:*:*</i> @@ -201,6 +201,7 @@ <i>io.prometheus:simpleclient_tracer_common:*:*</i> <i>io.prometheus:simpleclient_tracer_otel:*:*</i> <i>io.prometheus:simpleclient_tracer_otel_agent:*:*</i> + <i>jakarta.inject:jakarta.inject-api:*:*</i> <i>javax.inject:javax.inject:*:*</i> <i>net.openhft:zero-allocation-hashing:*:*</i> <i>org.antlr:antlr-runtime:*:*</i> diff --git a/configserver-flags/pom.xml b/configserver-flags/pom.xml index 02824f2e6e3..02395fc3559 100644 --- a/configserver-flags/pom.xml +++ b/configserver-flags/pom.xml @@ -58,7 +58,7 @@ <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> <scope>provided</scope> - <classifier>no_aop</classifier> + <exclusions> <exclusion> <groupId>junit</groupId> diff --git a/container-core/pom.xml b/container-core/pom.xml index 8c30dad7e22..549b3ad5953 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -290,7 +290,7 @@ <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> - <classifier>no_aop</classifier> + <scope>provided</scope> </dependency> <dependency> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 06e49e34da2..fa1212a5b12 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -73,7 +73,7 @@ <include>com.google.guava:failureaccess:[1.0.1, 2):provided</include> <include>com.google.j2objc:j2objc-annotations:[2.8, 3):provided</include> - <include>com.google.inject:guice:jar:no_aop:${guice.vespa.version}:provided</include> + <include>com.google.inject:guice:jar:${guice.vespa.version}:provided</include> <include>com.sun.activation:javax.activation:[1.2.0, 2):provided</include> <include>com.sun.xml.bind:jaxb-core:${jaxb-core.vespa.version}:provided</include> <include>com.sun.xml.bind:jaxb-impl:${jaxb-impl.vespa.version}:provided</include> @@ -162,6 +162,7 @@ <include>io.prometheus:simpleclient_tracer_common:${prometheus.client.vespa.version}:test</include> <include>io.prometheus:simpleclient_tracer_otel:${prometheus.client.vespa.version}:test</include> <include>io.prometheus:simpleclient_tracer_otel_agent:${prometheus.client.vespa.version}:test</include> + <include>jakarta.inject:jakarta.inject-api:${jakarta.inject.vespa.version}:test</include> <include>junit:junit:${junit4.vespa.version}:test</include> <include>net.java.dev.jna:jna:${jna.vespa.version}:test</include> <include>net.openhft:zero-allocation-hashing:jar:${zero-allocation-hashing.vespa.version}:test</include> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 8c0185c9b92..cf4d0bbe851 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -83,12 +83,6 @@ <version>${guice.vespa.version}</version> </dependency> <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - <version>${guice.vespa.version}</version> - <classifier>no_aop</classifier> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>${commons-logging.vespa.version}</version> diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 96aa120d42f..76ed8b1e3d4 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -55,7 +55,12 @@ <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> - <classifier>no_aop</classifier> + <exclusions> + <exclusion> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>net.java.dev.jna</groupId> diff --git a/container-messagebus/pom.xml b/container-messagebus/pom.xml index 2ad5633b7dc..38a2c8e2b78 100644 --- a/container-messagebus/pom.xml +++ b/container-messagebus/pom.xml @@ -19,7 +19,7 @@ <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> - <classifier>no_aop</classifier> + <scope>provided</scope> </dependency> <dependency> diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml index 71d547ecacd..3137fd449a4 100644 --- a/container-search-and-docproc/pom.xml +++ b/container-search-and-docproc/pom.xml @@ -101,7 +101,7 @@ <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> - <classifier>no_aop</classifier> + <scope>provided</scope> </dependency> <dependency> diff --git a/container-test/pom.xml b/container-test/pom.xml index a22d0b59ace..9c6fe8025a2 100644 --- a/container-test/pom.xml +++ b/container-test/pom.xml @@ -115,6 +115,11 @@ <groupId>org.lz4</groupId> <artifactId>lz4-java</artifactId> </dependency> + <dependency> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> + <version>${jakarta.inject.vespa.version}</version> + </dependency> <!-- START JETTY embedded jars --> <dependency> diff --git a/controller-server/pom.xml b/controller-server/pom.xml index 3c3c93735e7..0fcd55eb7d3 100644 --- a/controller-server/pom.xml +++ b/controller-server/pom.xml @@ -91,7 +91,7 @@ <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> - <classifier>no_aop</classifier> + <scope>provided</scope> </dependency> diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 615d3c15ed1..57ba759aad0 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -36,9 +36,10 @@ <commons-logging.vespa.version>1.2</commons-logging.vespa.version> <!-- This version is exported by jdisc via jcl-over-slf4j. --> <error-prone-annotations.vespa.version>2.21.1</error-prone-annotations.vespa.version> <guava.vespa.version>32.1.2-jre</guava.vespa.version> - <guice.vespa.version>4.2.3</guice.vespa.version> + <guice.vespa.version>6.0.0</guice.vespa.version> <jackson2.vespa.version>2.15.2</jackson2.vespa.version> <jackson-databind.vespa.version>2.15.2</jackson-databind.vespa.version> + <jakarta.inject.vespa.version>2.0.1</jakarta.inject.vespa.version> <javax.inject.vespa.version>1</javax.inject.vespa.version> <javax.servlet-api.vespa.version>3.1.0</javax.servlet-api.vespa.version> <javax.ws.rs-api.vespa.version>2.1.1</javax.ws.rs-api.vespa.version> diff --git a/document/pom.xml b/document/pom.xml index 5db432d2447..2b13a4ace4f 100644 --- a/document/pom.xml +++ b/document/pom.xml @@ -65,7 +65,7 @@ <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> - <classifier>no_aop</classifier> + <scope>provided</scope> </dependency> <dependency> diff --git a/flags/pom.xml b/flags/pom.xml index 0bfb02b1f32..816e5416cec 100644 --- a/flags/pom.xml +++ b/flags/pom.xml @@ -51,7 +51,7 @@ <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> - <classifier>no_aop</classifier> + <scope>provided</scope> </dependency> diff --git a/jdisc-security-filters/pom.xml b/jdisc-security-filters/pom.xml index 3440f9089d7..8a456d06a40 100644 --- a/jdisc-security-filters/pom.xml +++ b/jdisc-security-filters/pom.xml @@ -69,6 +69,11 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index e8529533320..9bc27cd4e77 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -82,7 +82,6 @@ <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> - <classifier>no_aop</classifier> <!-- Non-AOP version required for Java 8 compatibility --> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -208,7 +207,7 @@ <!-- WARNING: Removing jars from the list below usually requires a new major Vespa version. --> <!-- NOTE: This list must be kept in sync with ExportPackagesIT.java --> <argument>__REPLACE_VERSION__${project.build.directory}/dependency/guava.jar</argument> - <argument>${project.build.directory}/dependency/guice-no_aop.jar</argument> + <argument>${project.build.directory}/dependency/guice.jar</argument> <argument>${project.build.directory}/dependency/slf4j-api.jar</argument> <argument>${project.build.directory}/dependency/slf4j-jdk14.jar</argument> <argument>${project.build.directory}/dependency/jcl-over-slf4j.jar</argument> diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ExportPackagesIT.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ExportPackagesIT.java index b5a9e19bb2a..2d0b9ba9651 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ExportPackagesIT.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ExportPackagesIT.java @@ -36,7 +36,7 @@ public class ExportPackagesIT { // This list must be kept in sync with the list in the export-packages execution in pom.xml. private static final List<String> RE_EXPORTED_BUNDLES = Stream.of( "guava.jar", - "guice-no_aop.jar", + "guice.jar", "slf4j-api.jar", "slf4j-jdk14.jar", "jcl-over-slf4j.jar", diff --git a/linguistics-components/pom.xml b/linguistics-components/pom.xml index 19bb244b5d9..68b0437ac3f 100644 --- a/linguistics-components/pom.xml +++ b/linguistics-components/pom.xml @@ -87,7 +87,7 @@ <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> <scope>provided</scope> - <classifier>no_aop</classifier> + </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/linguistics/pom.xml b/linguistics/pom.xml index 5db3302b597..8813af8b981 100644 --- a/linguistics/pom.xml +++ b/linguistics/pom.xml @@ -56,7 +56,7 @@ <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> <scope>provided</scope> - <classifier>no_aop</classifier> + </dependency> </dependencies> <build> diff --git a/lucene-linguistics/pom.xml b/lucene-linguistics/pom.xml index 929d33a0736..18f2b1a8574 100644 --- a/lucene-linguistics/pom.xml +++ b/lucene-linguistics/pom.xml @@ -63,7 +63,7 @@ <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> - <classifier>no_aop</classifier> + <scope>provided</scope> </dependency> <dependency> diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt index 319d6874f40..e3e2e52339d 100644 --- a/maven-plugins/allowed-maven-dependencies.txt +++ b/maven-plugins/allowed-maven-dependencies.txt @@ -10,10 +10,11 @@ com.github.luben:zstd-jni:1.5.5-5 com.google.errorprone:error_prone_annotations:2.21.1 com.google.guava:failureaccess:1.0.1 com.google.guava:guava:32.1.2-jre -com.google.inject:guice:4.2.3 +com.google.inject:guice:6.0.0 com.google.j2objc:j2objc-annotations:2.8 commons-codec:commons-codec:1.16.0 commons-io:commons-io:2.13.0 +jakarta.inject:jakarta.inject-api:2.0.1 javax.annotation:javax.annotation-api:1.2 javax.inject:javax.inject:1 org.apache-extras.beanshell:bsh:2.0b6 diff --git a/parent/pom.xml b/parent/pom.xml index 1da2698b4cb..fc51e1810a2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1152,7 +1152,11 @@ <artifactId>google-auth-library-oauth2-http</artifactId> <version>1.19.0</version> </dependency> - + <dependency> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> + <version>${jakarta.inject.vespa.version}</version> + </dependency> </dependencies> </dependencyManagement> diff --git a/provided-dependencies/pom.xml b/provided-dependencies/pom.xml index 09d76265466..8bf84956a12 100755 --- a/provided-dependencies/pom.xml +++ b/provided-dependencies/pom.xml @@ -49,7 +49,7 @@ <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> - <classifier>no_aop</classifier> + </dependency> <!-- Dependencies used by container-core --> diff --git a/testutil/pom.xml b/testutil/pom.xml index 7f57b6defee..a26459c0b8a 100644 --- a/testutil/pom.xml +++ b/testutil/pom.xml @@ -24,7 +24,7 @@ <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> <scope>provided</scope> - <classifier>no_aop</classifier> + </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 636228a7672..23fab43bceb 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -36,7 +36,7 @@ com.google.guava:guava:32.1.2-jre com.google.http-client:google-http-client:1.43.3 com.google.http-client:google-http-client-apache-v2:1.43.3 com.google.http-client:google-http-client-gson:1.42.3 -com.google.inject:guice:4.2.3:no_aop +com.google.inject:guice:6.0.0 com.google.j2objc:j2objc-annotations:2.8 com.google.protobuf:protobuf-java:3.24.2 com.ibm.icu:icu4j:73.2 @@ -82,6 +82,7 @@ io.prometheus:simpleclient_tracer_common:0.16.0 io.prometheus:simpleclient_tracer_otel:0.16.0 io.prometheus:simpleclient_tracer_otel_agent:0.16.0 jakarta.annotation:jakarta.annotation-api:1.3.5 +jakarta.inject:jakarta.inject-api:2.0.1 jakarta.validation:jakarta.validation-api:2.0.2 jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 javax.activation:javax.activation-api:1.2.0 @@ -215,7 +216,6 @@ xerces:xercesImpl:2.12.2 #[test-only] # Contains dependencies that are used exclusively in 'test' scope -com.google.inject:guice:4.2.3 com.google.jimfs:jimfs:1.3.0 net.bytebuddy:byte-buddy:1.14.7 net.bytebuddy:byte-buddy-agent:1.14.7 |