From bb436916fd27e669ba0107761312d1cd4229a303 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Mon, 4 Sep 2023 13:42:44 +0200 Subject: Use Guice 6.0 https://github.com/google/guice/wiki/Guice600 We cannot upgrade to 7.x as we export javax.inject from container. 6.x supports both the old javax.inject and the new jakarta.inject replacement. --- vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vespa-dependencies-enforcer/allowed-maven-dependencies.txt') diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 50ab762bd9b..1019493a3b8 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 @@ -218,7 +219,6 @@ xml-apis:xml-apis:1.4.01 #[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 -- cgit v1.2.3