Merge branch 'master' into hmusum/upgrade-curator-2

1 files changed, 54 insertions, 56 deletions

diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index ce8cae2883b..9a991b4b60a 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -2,10 +2,10 @@
 
 #[non-test]
 # Contains dependencies that are not used exclusively in 'test' scope
+ai.djl:api:0.20.0
+ai.djl.huggingface:tokenizers:0.20.0
 aopalliance:aopalliance:1.0
 backport-util-concurrent:backport-util-concurrent:3.1
-biz.aQute.bnd:biz.aQute.bnd.util:6.1.0
-biz.aQute.bnd:biz.aQute.bndlib:6.1.0
 ch.qos.logback:logback-classic:1.2.10
 ch.qos.logback:logback-core:1.2.10
 classworlds:classworlds:1.1-alpha-2
@@ -25,7 +25,7 @@ com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.13.4
 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.13.4
 com.github.spotbugs:spotbugs-annotations:3.1.9
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.2.0
+com.google.errorprone:error_prone_annotations:2.18.0
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:27.1-jre
 com.google.inject:guice:4.2.3
@@ -34,7 +34,7 @@ com.google.j2objc:j2objc-annotations:1.1
 com.google.protobuf:protobuf-java:3.21.7
 com.ibm.icu:icu4j:70.1
 com.intellij:annotations:9.0.4
-com.microsoft.onnxruntime:onnxruntime:1.12.1
+com.microsoft.onnxruntime:onnxruntime:1.13.1
 com.sun.activation:javax.activation:1.2.0
 com.sun.istack:istack-commons-runtime:3.0.8
 com.sun.xml.bind:jaxb-core:2.3.0
@@ -47,28 +47,27 @@ com.yahoo.athenz:athenz-zms-core:1.10.54
 com.yahoo.athenz:athenz-zpe-java-client:1.10.54
 com.yahoo.athenz:athenz-zts-core:1.10.54
 com.yahoo.rdl:rdl-java:1.5.4
-commons-cli:commons-cli:1.4
+commons-cli:commons-cli:1.5.0
 commons-codec:commons-codec:1.15
 commons-fileupload:commons-fileupload:1.4
 commons-io:commons-io:2.11.0
 commons-logging:commons-logging:1.2
-io.airlift:aircompressor:0.21
 io.airlift:airline:0.9
 io.dropwizard.metrics:metrics-core:3.2.5
 io.jsonwebtoken:jjwt-api:0.11.2
 io.jsonwebtoken:jjwt-impl:0.11.2
 io.jsonwebtoken:jjwt-jackson:0.11.2
-io.netty:netty-buffer:4.1.85.Final
-io.netty:netty-codec:4.1.85.Final
-io.netty:netty-common:4.1.85.Final
-io.netty:netty-handler:4.1.85.Final
-io.netty:netty-resolver:4.1.85.Final
+io.netty:netty-buffer:4.1.86.Final
+io.netty:netty-codec:4.1.86.Final
+io.netty:netty-common:4.1.86.Final
+io.netty:netty-handler:4.1.86.Final
+io.netty:netty-resolver:4.1.86.Final
 io.netty:netty-tcnative:2.0.54.Final
 io.netty:netty-tcnative-classes:2.0.54.Final
-io.netty:netty-transport:4.1.85.Final
-io.netty:netty-transport-classes-epoll:4.1.85.Final
-io.netty:netty-transport-native-epoll:4.1.85.Final
-io.netty:netty-transport-native-unix-common:4.1.85.Final
+io.netty:netty-transport:4.1.86.Final
+io.netty:netty-transport-classes-epoll:4.1.86.Final
+io.netty:netty-transport-native-epoll:4.1.86.Final
+io.netty:netty-transport-native-unix-common:4.1.86.Final
 io.prometheus:simpleclient:0.6.0
 io.prometheus:simpleclient_common:0.6.0
 javax.annotation:javax.annotation-api:1.2
@@ -77,44 +76,44 @@ javax.servlet:javax.servlet-api:3.1.0
 javax.validation:validation-api:1.1.0.Final
 javax.ws.rs:javax.ws.rs-api:2.0.1
 javax.xml.bind:jaxb-api:2.3.0
-joda-time:joda-time:2.8.1
+joda-time:joda-time:2.12.2
 net.java.dev.jna:jna:5.11.0
 net.openhft:zero-allocation-hashing:0.16
-org.antlr:antlr-runtime:3.5.2
-org.antlr:antlr4-runtime:4.9.3
+org.antlr:antlr-runtime:3.5.3
+org.antlr:antlr4-runtime:4.11.1
 org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.5
-org.apache.commons:commons-compress:1.21
+org.apache.commons:commons-compress:1.22
 org.apache.commons:commons-csv:1.8
 org.apache.commons:commons-exec:1.3
-org.apache.commons:commons-lang3:3.11
+org.apache.commons:commons-lang3:3.12.0
 org.apache.commons:commons-math3:3.6.1
 org.apache.curator:curator-client:5.4.0
 org.apache.curator:curator-framework:5.4.0
 org.apache.curator:curator-recipes:5.4.0
 org.apache.felix:org.apache.felix.framework:7.0.1
 org.apache.felix:org.apache.felix.log:1.0.1
-org.apache.httpcomponents:httpclient:4.5.13
-org.apache.httpcomponents:httpcore:4.4.13
-org.apache.httpcomponents:httpmime:4.5.13
-org.apache.httpcomponents.client5:httpclient5:5.1.3
-org.apache.httpcomponents.core5:httpcore5:5.1.3
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3
+org.apache.httpcomponents:httpclient:4.5.14
+org.apache.httpcomponents:httpcore:4.4.16
+org.apache.httpcomponents:httpmime:4.5.14
+org.apache.httpcomponents.client5:httpclient5:5.2.1
+org.apache.httpcomponents.core5:httpcore5:5.2.1
+org.apache.httpcomponents.core5:httpcore5-h2:5.2.1
 org.apache.maven:maven-archiver:3.6.0
-org.apache.maven:maven-artifact:3.8.6
+org.apache.maven:maven-artifact:3.8.7
 org.apache.maven:maven-artifact-manager:2.2.1
-org.apache.maven:maven-builder-support:3.8.6
+org.apache.maven:maven-builder-support:3.8.7
 org.apache.maven:maven-compat:3.0
-org.apache.maven:maven-core:3.8.6
-org.apache.maven:maven-model:3.8.6
-org.apache.maven:maven-model-builder:3.8.6
-org.apache.maven:maven-plugin-api:3.8.6
+org.apache.maven:maven-core:3.8.7
+org.apache.maven:maven-model:3.8.7
+org.apache.maven:maven-model-builder:3.8.7
+org.apache.maven:maven-plugin-api:3.8.7
 org.apache.maven:maven-plugin-registry:2.2.1
 org.apache.maven:maven-profile:2.2.1
 org.apache.maven:maven-project:2.2.1
-org.apache.maven:maven-repository-metadata:3.8.6
-org.apache.maven:maven-resolver-provider:3.8.6
-org.apache.maven:maven-settings:3.8.6
-org.apache.maven:maven-settings-builder:3.8.6
+org.apache.maven:maven-repository-metadata:3.8.7
+org.apache.maven:maven-resolver-provider:3.8.7
+org.apache.maven:maven-settings:3.8.7
+org.apache.maven:maven-settings-builder:3.8.7
 org.apache.maven.plugin-tools:maven-plugin-annotations:3.6.4
 org.apache.maven.plugins:maven-jar-plugin:3.2.0
 org.apache.maven.resolver:maven-resolver-api:1.6.3
@@ -129,7 +128,9 @@ org.apache.opennlp:opennlp-tools:1.9.3
 org.apache.velocity:velocity-engine-core:2.3
 org.apache.yetus:audience-annotations:0.12.0
 org.apache.zookeeper:zookeeper:3.8.0
+org.apache.zookeeper:zookeeper:3.8.1
 org.apache.zookeeper:zookeeper-jute:3.8.0
+org.apache.zookeeper:zookeeper-jute:3.8.1
 org.apiguardian:apiguardian-api:1.1.2
 org.bouncycastle:bcpkix-jdk18on:1.72
 org.bouncycastle:bcprov-jdk18on:1.72
@@ -145,23 +146,21 @@ org.codehaus.plexus:plexus-sec-dispatcher:2.0
 org.codehaus.plexus:plexus-utils:3.3.1
 org.eclipse.collections:eclipse-collections:11.0.0
 org.eclipse.collections:eclipse-collections-api:11.0.0
-org.eclipse.jetty:jetty-alpn-java-server:9.4.49.v20220914
-org.eclipse.jetty:jetty-alpn-server:9.4.49.v20220914
-org.eclipse.jetty:jetty-client:9.4.49.v20220914
-org.eclipse.jetty:jetty-continuation:9.4.49.v20220914
-org.eclipse.jetty:jetty-http:9.4.49.v20220914
-org.eclipse.jetty:jetty-io:9.4.49.v20220914
-org.eclipse.jetty:jetty-jmx:9.4.49.v20220914
-org.eclipse.jetty:jetty-security:9.4.49.v20220914
-org.eclipse.jetty:jetty-server:9.4.49.v20220914
-org.eclipse.jetty:jetty-servlet:9.4.49.v20220914
-org.eclipse.jetty:jetty-servlets:9.4.49.v20220914
-org.eclipse.jetty:jetty-util:9.4.49.v20220914
-org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914
-org.eclipse.jetty.alpn:alpn-api:1.1.3.v20160715
-org.eclipse.jetty.http2:http2-common:9.4.49.v20220914
-org.eclipse.jetty.http2:http2-hpack:9.4.49.v20220914
-org.eclipse.jetty.http2:http2-server:9.4.49.v20220914
+org.eclipse.jetty:jetty-alpn-client:11.0.13
+org.eclipse.jetty:jetty-alpn-java-server:11.0.13
+org.eclipse.jetty:jetty-alpn-server:11.0.13
+org.eclipse.jetty:jetty-client:11.0.13
+org.eclipse.jetty:jetty-http:11.0.13
+org.eclipse.jetty:jetty-io:11.0.13
+org.eclipse.jetty:jetty-jmx:11.0.13
+org.eclipse.jetty:jetty-security:11.0.13
+org.eclipse.jetty:jetty-server:11.0.13
+org.eclipse.jetty:jetty-servlet:11.0.13
+org.eclipse.jetty:jetty-util:11.0.13
+org.eclipse.jetty.http2:http2-common:11.0.13
+org.eclipse.jetty.http2:http2-hpack:11.0.13
+org.eclipse.jetty.http2:http2-server:11.0.13
+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
@@ -207,7 +206,6 @@ org.slf4j:jcl-over-slf4j:1.7.32
 org.slf4j:log4j-over-slf4j:1.7.32
 org.slf4j:slf4j-api:1.7.32
 org.slf4j:slf4j-jdk14:1.7.32
-org.slf4j:slf4j-nop:1.7.32
 org.slf4j:slf4j-simple:1.7.32
 org.sonatype.sisu:sisu-guice:2.1.7:noaop
 org.sonatype.sisu:sisu-inject-bean:1.4.2
@@ -220,6 +218,7 @@ xml-apis:xml-apis:1.4.01
 
 #[test-only]
 # Contains dependencies that are used exclusively in 'test' scope
+com.github.luben:zstd-jni:1.5.2-1
 com.github.tomakehurst:wiremock-jre8-standalone:2.35.0
 com.google.guava:guava-testlib:27.1-jre
 com.google.jimfs:jimfs:1.2
@@ -228,7 +227,7 @@ net.bytebuddy:byte-buddy:1.11.19
 net.bytebuddy:byte-buddy-agent:1.11.19
 org.apache.curator:curator-test:5.4.0
 org.assertj:assertj-core:3.11.1
-org.checkerframework:checker-qual:2.5.2
+org.checkerframework:checker-qual:3.30.0
 org.cthul:cthul-matchers:1.0
 org.hamcrest:hamcrest-all:1.3
 org.hamcrest:hamcrest-core:1.3
@@ -239,4 +238,3 @@ org.junit.vintage:junit-vintage-engine:5.8.1
 org.mockito:mockito-core:4.0.0
 org.mockito:mockito-junit-jupiter:4.0.0
 org.objenesis:objenesis:3.2
-xmlunit:xmlunit:1.5