diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-09-04 19:49:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-04 19:49:27 +0200 |
| commit | 8586e0137c6ec1dc0a9d10b0fcbc5578e122c504 (patch) | |
| tree | 0d356ae9de3ec1642e6fce735631d60d19a4c787 /vespa-dependencies-enforcer | |
| parent | 5b60dfc46e42d7c78f68e74f71b76ae8ad41e14d (diff) | |
| parent | bedbd44069d0464bbd23a367e144cb32fad4573a (diff) | |
Merge branch 'master' into bjorncs/move-jersey-out
Diffstat (limited to 'vespa-dependencies-enforcer')
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index cfe3a5c0877..ff43dbb045b 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -33,7 +33,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 @@ -78,6 +78,7 @@ io.prometheus:simpleclient_common:0.16.0 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.inject:jakarta.inject-api:2.0.1 javax.activation:javax.activation-api:1.2.0 javax.annotation:javax.annotation-api:1.2 javax.inject:javax.inject:1 @@ -100,7 +101,7 @@ org.apache.curator:curator-client:5.5.0 org.apache.curator:curator-framework:5.5.0 org.apache.curator:curator-recipes:5.5.0 org.apache.felix:org.apache.felix.framework:7.0.5 -org.apache.felix:org.apache.felix.log:1.0.1 +org.apache.felix:org.apache.felix.log:1.3.0 org.apache.httpcomponents:httpclient:4.5.14 org.apache.httpcomponents:httpcore:4.4.16 org.apache.httpcomponents:httpmime:4.5.14 @@ -181,8 +182,6 @@ org.junit.platform:junit-platform-launcher:1.8.1 org.kohsuke:libpam4j:1.11 org.lz4:lz4-java:1.8.0 org.opentest4j:opentest4j:1.3.0 -org.osgi:org.osgi.compendium:4.1.0 -org.osgi:org.osgi.core:4.1.0 org.ow2.asm:asm:9.5 org.ow2.asm:asm-analysis:9.5 org.ow2.asm:asm-commons:9.5 @@ -198,11 +197,9 @@ org.tukaani:xz:1.9 org.xerial.snappy:snappy-java:1.1.10.3 software.amazon.ion:ion-java:1.0.2 xerces:xercesImpl:2.12.2 -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 |