diff options
| author | Arne Juul <arnej@vespa.ai> | 2024-03-25 08:23:49 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@yahooinc.com> | 2024-04-02 15:57:16 +0200 |
| commit | 7c5944fe394998becbd7448711fc6e25922882ff (patch) | |
| tree | 5d0ff50522dfb8aa7b0dd38fad5150108a0ed410 | |
| parent | da256a41081afb82aab855a49ec07443b3fe595a (diff) | |
minor cleanup for de.kherud:llama
| -rw-r--r-- | container-llama/pom.xml | 1 | ||||
| -rw-r--r-- | dependency-versions/pom.xml | 2 | ||||
| -rw-r--r-- | parent/pom.xml | 11 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/container-llama/pom.xml b/container-llama/pom.xml index 47941807d4c..33ded1afa51 100644 --- a/container-llama/pom.xml +++ b/container-llama/pom.xml @@ -35,7 +35,6 @@ <dependency> <groupId>de.kherud</groupId> <artifactId>llama</artifactId> - <version>${java-llama.vespa.version}</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 2a621786a6a..bb748e681bd 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -115,6 +115,7 @@ <junit.vespa.version>5.10.2</junit.vespa.version> <junit.platform.vespa.version>1.10.2</junit.platform.vespa.version> <junit4.vespa.version>4.13.2</junit4.vespa.version> + <kherud.llama.vespa.version>2.3.5</kherud.llama.vespa.version> <luben.zstd.vespa.version>1.5.6-1</luben.zstd.vespa.version> <lucene.vespa.version>9.10.0</lucene.vespa.version> <maven-archiver.vespa.version>3.6.1</maven-archiver.vespa.version> @@ -125,7 +126,6 @@ <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 890a0509cd6..727bdf3ae80 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -593,12 +593,11 @@ <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>de.kherud</groupId> + <artifactId>llama</artifactId> + <version>${kherud.llama.vespa.version}</version> + </dependency> <dependency> <groupId>com.yahoo.athenz</groupId> <artifactId>athenz-cert-refresher</artifactId> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 57a83a5cef6..9a9b7b269cb 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -30,7 +30,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} -de.kherud:llama:${java-llama.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 |