summaryrefslogtreecommitdiffstats
path: root/container-dependencies-enforcer
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahooinc.com>2023-09-04 13:42:44 +0200
committerBjørn Christian Seime <bjorncs@yahooinc.com>2023-09-04 16:31:44 +0200
commitbb436916fd27e669ba0107761312d1cd4229a303 (patch)
tree3a3719375bed566d760b540c590a79b7f167ad13 /container-dependencies-enforcer
parentd52e759812a446ae454f2829ee12e6d6e669592d (diff)
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.
Diffstat (limited to 'container-dependencies-enforcer')
-rw-r--r--container-dependencies-enforcer/pom.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml
index 885be3b6ee6..2275e6429d7 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>
@@ -163,6 +163,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>