summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne Juul <arnej@yahooinc.com>2024-04-03 09:07:02 +0200
committerArne Juul <arnej@yahooinc.com>2024-04-03 09:07:02 +0200
commit064d3bb6de0aa719fe130123b8f63a161ac48bb3 (patch)
tree1281da9e99793818d087beafaf1b38656cbdc158
parent8d72196e3aadc0d2a3e86f22d9c64fbaaeb7da6b (diff)
exclude org.jetbrains:annotations
-rw-r--r--container-llama/pom.xml6
-rw-r--r--vespa-dependencies-enforcer/allowed-maven-dependencies.txt1
2 files changed, 6 insertions, 1 deletions
diff --git a/container-llama/pom.xml b/container-llama/pom.xml
index 33ded1afa51..1eb057abcaf 100644
--- a/container-llama/pom.xml
+++ b/container-llama/pom.xml
@@ -36,6 +36,12 @@
<groupId>de.kherud</groupId>
<artifactId>llama</artifactId>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<build>
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index 9a9b7b269cb..27e6a0b1fd1 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -31,7 +31,6 @@ com.google.protobuf:protobuf-java:${protobuf.vespa.version}
com.ibm.icu:icu4j:${icu4j.vespa.version}
com.microsoft.onnxruntime:onnxruntime:${onnxruntime.vespa.version}
de.kherud:llama:${kherud.llama.vespa.version}
-org.jetbrains:annotations:24.0.1
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}