diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-09-05 12:49:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-05 12:49:39 +0200 |
commit | 6d783357cf83163a1298372e88020d3d73c25e3c (patch) | |
tree | 459daa166d10f7fe743031e707a32c78f839091e /container-dependencies-enforcer/pom.xml | |
parent | 2697fbc195ef428210925e4b05223e0ab64405a4 (diff) | |
parent | 05df635cab10d2e312a10e0620a0e6558a4de013 (diff) |
Merge branch 'master' into renovate/junit5-monorepo
Diffstat (limited to 'container-dependencies-enforcer/pom.xml')
-rw-r--r-- | container-dependencies-enforcer/pom.xml | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 3c991823d5d..fa1212a5b12 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -73,20 +73,19 @@ <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.vespa.version}:provided</include> - <include>com.sun.xml.bind:jaxb-impl:${jaxb.vespa.version}: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> <include>commons-logging:commons-logging:${commons-logging.vespa.version}:provided</include> <include>javax.inject:javax.inject:${javax.inject.vespa.version}:provided</include> <include>javax.servlet:javax.servlet-api:${javax.servlet-api.vespa.version}:provided</include> <include>javax.ws.rs:javax.ws.rs-api:${javax.ws.rs-api.vespa.version}:provided</include> - <include>javax.xml.bind:jaxb-api:${jaxb.vespa.version}:provided</include> + <include>javax.xml.bind:jaxb-api:${jaxb-api.vespa.version}:provided</include> <include>org.slf4j:jcl-over-slf4j:${slf4j.vespa.version}:provided</include> <include>org.slf4j:log4j-over-slf4j:${slf4j.vespa.version}:provided</include> <include>org.slf4j:slf4j-api:${slf4j.vespa.version}:provided</include> <include>org.slf4j:slf4j-jdk14:${slf4j.vespa.version}:provided</include> - <include>xml-apis:xml-apis:${xml-apis.vespa.version}:provided</include> <!-- Vespa provided dependencies --> <include>com.yahoo.vespa:annotations:*:provided</include> @@ -163,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> @@ -203,8 +203,6 @@ <include>org.hdrhistogram:HdrHistogram:${hdrhistogram.vespa.version}:test</include> <include>org.json:json:${org.json.vespa.version}:test</include> <!-- TODO: Remove on Vespa 9 --> <include>org.lz4:lz4-java:${org.lz4.vespa.version}:test</include> - <include>org.osgi:org.osgi.compendium:[4.1.0, 5):test</include> - <include>org.osgi:org.osgi.core:[4.1.0, 5):test</include> <include>xerces:xercesImpl:${xerces.vespa.version}:test</include> </allowed> </enforceDependencies> |