summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne Juul <arnej@vespa.ai>2024-03-22 13:17:00 +0000
committerArne Juul <arnej@yahooinc.com>2024-04-02 15:56:18 +0200
commitda256a41081afb82aab855a49ec07443b3fe595a (patch)
tree1a63001f4840b583ae90f3488d515c98951a40d9
parentf83cc4e37fea07eb758f8c4a734326800a2d0f6a (diff)
some wiring for de.kherud:llama
-rw-r--r--container-llama/pom.xml2
-rw-r--r--dependency-versions/pom.xml1
-rw-r--r--parent/pom.xml6
-rw-r--r--pom.xml1
-rw-r--r--vespa-dependencies-enforcer/allowed-maven-dependencies.txt2
5 files changed, 11 insertions, 1 deletions
diff --git a/container-llama/pom.xml b/container-llama/pom.xml
index 38b9f96d653..47941807d4c 100644
--- a/container-llama/pom.xml
+++ b/container-llama/pom.xml
@@ -35,7 +35,7 @@
<dependency>
<groupId>de.kherud</groupId>
<artifactId>llama</artifactId>
- <version>2.3.5</version>
+ <version>${java-llama.vespa.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml
index dc375ec647f..2a621786a6a 100644
--- a/dependency-versions/pom.xml
+++ b/dependency-versions/pom.xml
@@ -125,6 +125,7 @@
<netty.vespa.version>4.1.108.Final</netty.vespa.version>
<netty-tcnative.vespa.version>2.0.65.Final</netty-tcnative.vespa.version>
<onnxruntime.vespa.version>1.17.1</onnxruntime.vespa.version>
+ <java-llama.vespa.version>2.3.5</java-llama.vespa.version>
<opennlp.vespa.version>2.3.2</opennlp.vespa.version>
<opentest4j.vespa.version>1.3.0</opentest4j.vespa.version>
<org.json.vespa.version>20240303</org.json.vespa.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index ca399019aa6..890a0509cd6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -593,6 +593,12 @@
<artifactId>onnxruntime</artifactId>
<version>${onnxruntime.vespa.version}</version>
</dependency>
+ <dependency>
+ <groupId>de.kherud</groupId>
+ <artifactId>llama</artifactId>
+ <version>${java-llama.vespa.version}</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>com.yahoo.athenz</groupId>
<artifactId>athenz-cert-refresher</artifactId>
diff --git a/pom.xml b/pom.xml
index 52e0ad68215..2ed4e763b95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,7 @@
<module>container-dev</module>
<module>container-disc</module>
<module>container-documentapi</module>
+ <module>container-llama</module>
<module>container-messagebus</module>
<module>container-onnxruntime</module>
<module>container-search-and-docproc</module>
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index 9ffde513481..57a83a5cef6 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -30,6 +30,8 @@ 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}
+de.kherud:llama:${java-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}