diff options
author | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
---|---|---|
committer | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
commit | 567be9a1f6353cec41c23bfd1fcd46b4b2a4d2d7 (patch) | |
tree | 4664a743e166a5e11aee7b9acd70ad8ee2617612 /vespa-dependencies-enforcer/allowed-maven-dependencies.txt | |
parent | e9058b555d4dfea2f6c872d9a677e8678b569569 (diff) | |
parent | bce3b8e926bf9da880172acbe1ba4b12d5e026d6 (diff) |
Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller
Diffstat (limited to 'vespa-dependencies-enforcer/allowed-maven-dependencies.txt')
-rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 3ae0923aef0..941f7d78b99 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -1,7 +1,7 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -ai.djl.huggingface:tokenizers:0.23.0 -ai.djl:api:0.23.0 +ai.djl.huggingface:tokenizers:${huggingface.vespa.version} +ai.djl:api:${huggingface.vespa.version} aopalliance:aopalliance:${aopalliance.vespa.version} backport-util-concurrent:backport-util-concurrent:3.1 ch.qos.logback:logback-classic:1.2.10 @@ -20,6 +20,7 @@ com.fasterxml.jackson.core:jackson-databind:${jackson-databind.vespa.version} com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson2.vespa.version} com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2.vespa.version} com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson2.vespa.version} +com.github.cliftonlabs:json-simple:${findbugs.vespa.version} com.github.luben:zstd-jni:${luben.zstd.vespa.version} com.github.spotbugs:spotbugs-annotations:3.1.9 com.google.code.findbugs:jsr305:${findbugs.vespa.version} @@ -32,7 +33,7 @@ com.google.jimfs:jimfs:${jimfs.vespa.version} com.google.protobuf:protobuf-java:${protobuf.vespa.version} com.ibm.icu:icu4j:${icu4j.vespa.version} com.microsoft.onnxruntime:onnxruntime:${onnxruntime.vespa.version} -com.sun.activation:javax.activation:${properties-maven-plugin.vespa.version} +com.sun.activation:javax.activation:1.2.0 com.sun.istack:istack-commons-runtime:4.1.2 com.sun.xml.bind:jaxb-core:${jaxb-core.vespa.version} com.sun.xml.bind:jaxb-impl:${jaxb-impl.vespa.version} @@ -43,8 +44,10 @@ com.yahoo.athenz:athenz-zms-core:${athenz.vespa.version} com.yahoo.athenz:athenz-zpe-java-client:${athenz.vespa.version} com.yahoo.athenz:athenz-zts-core:${athenz.vespa.version} com.yahoo.rdl:rdl-java:1.5.4 +commons-beanutils:commons-beanutils:${commons-beanutils.vespa.version} commons-cli:commons-cli:1.5.0 commons-codec:commons-codec:${commons-codec.vespa.version} +commons-collections:commons-collections:${commons-collections.vespa.version} commons-fileupload:commons-fileupload:1.5 commons-io:commons-io:${commons-io.vespa.version} commons-logging:commons-logging:${commons-logging.vespa.version} @@ -70,7 +73,7 @@ io.prometheus:simpleclient_tracer_common:${prometheus.client.vespa.version} io.prometheus:simpleclient_tracer_otel:${prometheus.client.vespa.version} io.prometheus:simpleclient_tracer_otel_agent:${prometheus.client.vespa.version} jakarta.inject:jakarta.inject-api:${jakarta.inject.vespa.version} -javax.activation:javax.activation-api:${properties-maven-plugin.vespa.version} +javax.activation:javax.activation-api:1.2.0 javax.annotation:javax.annotation-api:${commons-logging.vespa.version} javax.inject:javax.inject:${javax.inject.vespa.version} javax.servlet:javax.servlet-api:${javax.servlet-api.vespa.version} @@ -87,6 +90,7 @@ org.antlr:antlr4-runtime:${antlr4.vespa.version} org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:${spifly.vespa.version} org.apache.commons:commons-compress:${commons-compress.vespa.version} org.apache.commons:commons-csv:${commons-csv.vespa.version} +org.apache.commons:commons-digester3:${commons-digester.vespa.version} org.apache.commons:commons-exec:${commons-exec.vespa.version} org.apache.commons:commons-lang3:${commons-lang3.vespa.version} org.apache.commons:commons-math3:${commons.math3.vespa.version} @@ -119,7 +123,8 @@ org.apache.maven:maven-project:2.2.1 org.apache.maven:maven-repository-metadata:${maven-core.vespa.version} org.apache.maven:maven-settings:${maven-core.vespa.version} org.apache.opennlp:opennlp-tools:${opennlp.vespa.version} -org.apache.velocity:velocity-engine-core:2.3 +org.apache.velocity.tools:velocity-tools-generic:${velocity.tools.vespa.version} +org.apache.velocity:velocity-engine-core:${velocity.vespa.version} org.apache.yetus:audience-annotations:0.12.0 org.apache.zookeeper:zookeeper-jute:${zookeeper.client.vespa.version} org.apache.zookeeper:zookeeper-jute:3.8.1 |