Merge branch 'master' into renovate/junit5-monorepo

1 files changed, 23 insertions, 42 deletions

diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index e8ecee89350..f3d7489c960 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -20,9 +20,6 @@ com.fasterxml.jackson.core:jackson-databind:2.15.2
 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.2
 com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.2
 com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.15.2
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.15.2
-com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.15.2
 com.github.luben:zstd-jni:1.5.5-5
 com.github.spotbugs:spotbugs-annotations:3.1.9
 com.google.auth:google-auth-library-credentials:1.19.0
@@ -36,21 +33,21 @@ 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
 com.microsoft.onnxruntime:onnxruntime:1.15.1
 com.sun.activation:javax.activation:1.2.0
-com.sun.istack:istack-commons-runtime:3.0.12
-com.sun.xml.bind:jaxb-core:2.3.0
+com.sun.istack:istack-commons-runtime:4.1.2
+com.sun.xml.bind:jaxb-core:2.3.0.1
 com.sun.xml.bind:jaxb-impl:2.3.0
 com.thaiopensource:jing:20091111
-com.yahoo.athenz:athenz-auth-core:1.11.40
-com.yahoo.athenz:athenz-client-common:1.11.40
-com.yahoo.athenz:athenz-zms-core:1.11.40
-com.yahoo.athenz:athenz-zpe-java-client:1.11.40
-com.yahoo.athenz:athenz-zts-core:1.11.40
+com.yahoo.athenz:athenz-auth-core:1.11.41
+com.yahoo.athenz:athenz-client-common:1.11.41
+com.yahoo.athenz:athenz-zms-core:1.11.41
+com.yahoo.athenz:athenz-zpe-java-client:1.11.41
+com.yahoo.athenz:athenz-zts-core:1.11.41
 com.yahoo.rdl:rdl-java:1.5.4
 commons-cli:commons-cli:1.5.0
 commons-codec:commons-codec:1.16.0
@@ -58,7 +55,7 @@ commons-fileupload:commons-fileupload:1.5
 commons-io:commons-io:2.13.0
 commons-logging:commons-logging:1.2
 io.airlift:airline:0.9
-io.dropwizard.metrics:metrics-core:3.2.6
+io.dropwizard.metrics:metrics-core:4.2.19
 io.grpc:grpc-context:1.27.2
 io.jsonwebtoken:jjwt-api:0.11.5
 io.jsonwebtoken:jjwt-impl:0.11.5
@@ -81,20 +78,19 @@ 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.annotation:jakarta.annotation-api:1.3.5
-jakarta.validation:jakarta.validation-api:2.0.2
-jakarta.ws.rs:jakarta.ws.rs-api:2.1.6
+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
 javax.servlet:javax.servlet-api:3.1.0
 javax.ws.rs:javax.ws.rs-api:2.1.1
-javax.xml.bind:jaxb-api:2.3.0
+javax.xml.bind:jaxb-api:2.3.1
 joda-time:joda-time:2.12.5
 junit:junit:4.13.2
 net.java.dev.jna:jna:5.13.0
 net.openhft:zero-allocation-hashing:0.16
 org.antlr:antlr-runtime:3.5.3
-org.antlr:antlr4-runtime:4.13.0
+org.antlr:antlr4-runtime:4.13.1
 org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.6
 org.apache.commons:commons-compress:1.23.0
 org.apache.commons:commons-csv:1.10.0
@@ -105,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
@@ -128,7 +124,7 @@ org.apache.maven.plugin-tools:maven-plugin-annotations:3.9.0
 org.apache.maven.plugins:maven-jar-plugin:3.3.0
 org.apache.maven.shared:file-management:3.1.0
 org.apache.maven.wagon:wagon-provider-api:3.5.3
-org.apache.opennlp:opennlp-tools:1.9.4
+org.apache.opennlp:opennlp-tools:2.3.0
 org.apache.velocity:velocity-engine-core:2.3
 org.apache.yetus:audience-annotations:0.12.0
 org.apache.zookeeper:zookeeper:3.8.0
@@ -146,6 +142,7 @@ org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1
 org.codehaus.plexus:plexus-interpolation:1.26
 org.codehaus.plexus:plexus-io:3.4.1
 org.codehaus.plexus:plexus-utils:3.5.1
+org.eclipse.angus:angus-activation:2.0.1
 org.eclipse.collections:eclipse-collections:11.1.0
 org.eclipse.collections:eclipse-collections-api:11.1.0
 org.eclipse.jetty:jetty-alpn-client:11.0.16
@@ -169,17 +166,9 @@ org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2
 org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5
 org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5
 org.fusesource.jansi:jansi:1.18
-org.glassfish.hk2:osgi-resource-locator:1.0.3
-org.glassfish.hk2.external:jakarta.inject:2.6.1
-org.glassfish.jaxb:jaxb-runtime:2.3.8
-org.glassfish.jaxb:txw2:2.3.8
-org.glassfish.jersey.core:jersey-client:2.40
-org.glassfish.jersey.core:jersey-common:2.40
-org.glassfish.jersey.core:jersey-server:2.40
-org.glassfish.jersey.ext:jersey-entity-filtering:2.40
-org.glassfish.jersey.ext:jersey-proxy-client:2.40
-org.glassfish.jersey.media:jersey-media-json-jackson:2.40
-org.glassfish.jersey.media:jersey-media-multipart:2.40
+org.glassfish.jaxb:jaxb-core:4.0.3
+org.glassfish.jaxb:jaxb-runtime:4.0.3
+org.glassfish.jaxb:txw2:4.0.3
 org.hamcrest:hamcrest:2.2
 org.hamcrest:hamcrest-core:2.2
 org.hdrhistogram:HdrHistogram:2.1.12
@@ -190,18 +179,15 @@ org.junit.jupiter:junit-jupiter-engine:5.10.0
 org.junit.platform:junit-platform-commons:1.10.0
 org.junit.platform:junit-platform-engine:1.10.0
 org.junit.platform:junit-platform-launcher:1.10.0
-org.jvnet.mimepull:mimepull:1.10.0
 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
 org.ow2.asm:asm-tree:9.5
 org.ow2.asm:asm-util:9.5
-org.questdb:questdb:6.3.1
+org.questdb:questdb:7.3.1
 org.slf4j:jcl-over-slf4j:1.7.36
 org.slf4j:log4j-over-slf4j:1.7.36
 org.slf4j:slf4j-api:1.7.36
@@ -211,23 +197,18 @@ 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.github.tomakehurst:wiremock-jre8-standalone:2.35.0
-com.google.guava:guava-testlib:32.1.2-jre
-com.google.inject:guice:4.2.3
 com.google.jimfs:jimfs:1.3.0
-net.bytebuddy:byte-buddy:1.12.21
-net.bytebuddy:byte-buddy:1.14.6
-net.bytebuddy:byte-buddy-agent:1.14.6
+net.bytebuddy:byte-buddy:1.14.7
+net.bytebuddy:byte-buddy-agent:1.14.7
 org.apache.curator:curator-test:5.5.0
 org.assertj:assertj-core:3.24.2
-org.checkerframework:checker-qual:3.37.0
 org.junit.jupiter:junit-jupiter:5.10.0
 org.junit.jupiter:junit-jupiter-params:5.10.0
 org.junit.vintage:junit-vintage-engine:5.10.0
 org.mockito:mockito-core:5.5.0
 org.mockito:mockito-junit-jupiter:5.5.0
 org.objenesis:objenesis:3.3
+org.wiremock:wiremock-standalone:3.0.1