diff options
author | Jon Bratseth <bratseth@gmail.com> | 2023-01-06 16:41:33 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2023-01-06 16:41:33 +0100 |
commit | e48e936ed69ac77d0cea93c829de7bcdce12be55 (patch) | |
tree | 4a5be4a8a124d63e8adf78c478adfa8a1b92d4f4 | |
parent | f9ecee8aa3a93b3cf4cf22cfc5233a52fb697c8d (diff) |
Allow model-integration:huggingface dependencies
-rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 3 | ||||
-rw-r--r-- | config-model-fat/pom.xml | 4 | ||||
-rw-r--r-- | model-integration/pom.xml | 6 | ||||
-rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 2 |
4 files changed, 15 insertions, 0 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index e6445943107..78178c9f5dc 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -174,6 +174,8 @@ <include>com.yahoo.vespa:vsm:*:test</include> <!-- 3rd party test dependencies --> + <include>ai.djl:api:jar:0.20.0:test</include> + <include>ai.djl.huggingface:tokenizers:jar:0.20.0:test</include> <include>com.google.code.findbugs:jsr305:3.0.2:test</include> <include>com.google.protobuf:protobuf-java:3.21.7:test</include> <include>com.ibm.icu:icu4j:70.1:test</include> @@ -190,6 +192,7 @@ <include>org.antlr:antlr4-runtime:4.9.3:test</include> <include>org.apache.commons:commons-exec:1.3:test</include> <include>org.apache.commons:commons-math3:3.6.1:test</include> + <include>org.apache.commons:commons-compress:jar:1.22:test</include> <include>org.apache.felix:org.apache.felix.framework:${felix.version}:test</include> <include>org.apache.felix:org.apache.felix.log:1.0.1:test</include> <include>org.apache.httpcomponents.client5:httpclient5:${httpclient5.version}:test</include> diff --git a/config-model-fat/pom.xml b/config-model-fat/pom.xml index fa1a7558745..85f462b4ee6 100644 --- a/config-model-fat/pom.xml +++ b/config-model-fat/pom.xml @@ -187,6 +187,8 @@ <i>com.yahoo.vespa:vsm:*:*</i> <!-- 3rd party artifacts embedded --> + <i>ai.djl:api:jar:*:*</i> + <i>ai.djl.huggingface:tokenizers:*:*</i> <i>aopalliance:aopalliance:*:*</i> <i>biz.aQute.bnd:biz.aQute.bnd.util:*:*</i> <i>biz.aQute.bnd:biz.aQute.bndlib:*:*</i> @@ -208,9 +210,11 @@ <i>io.prometheus:simpleclient:*:*</i> <i>io.prometheus:simpleclient_common:*:*</i> <i>javax.inject:javax.inject:*:*</i> + <i>net.java.dev.jna:jna:*:*</i> <i>net.openhft:zero-allocation-hashing:*:*</i> <i>org.antlr:antlr-runtime:*:*</i> <i>org.antlr:antlr4-runtime:*:*</i> + <i>org.apache.commons:commons-compress:*:*</i> <i>org.apache.felix:org.apache.felix.framework:*:*</i> <i>org.bouncycastle:bcpkix-jdk18on:*:*</i> <i>org.bouncycastle:bcprov-jdk18on:*:*</i> diff --git a/model-integration/pom.xml b/model-integration/pom.xml index 36a2be1df5a..1f91d296e6a 100644 --- a/model-integration/pom.xml +++ b/model-integration/pom.xml @@ -67,6 +67,12 @@ <groupId>ai.djl.huggingface</groupId> <artifactId>tokenizers</artifactId> <version>0.20.0</version> + <exclusions> + <exclusion> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index abf1029d51c..d5cd56ad423 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -2,6 +2,8 @@ #[non-test] # Contains dependencies that are not used exclusively in 'test' scope +ai.djl.huggingface:tokenizers:0.20.0 +ai.djl:api: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 |