diff options
| author | Lester Solbakken <lester.solbakken@gmail.com> | 2024-04-16 14:04:39 +0200 |
|---|---|---|
| committer | Lester Solbakken <lester.solbakken@gmail.com> | 2024-04-16 14:04:39 +0200 |
| commit | c504fbc2763993deb7927393f424aeb5447b5fd7 (patch) | |
| tree | 80c83b0ea517c168da84cf0613c25e8429d2e3c8 | |
| parent | 44e36267bf12cdaba80ae453c94429ebefc34cde (diff) | |
Update (wrongly) merged dependencies
| -rw-r--r-- | application/pom.xml | 10 | ||||
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | container-search-and-docproc/pom.xml | 16 | ||||
| -rw-r--r-- | fat-model-dependencies/pom.xml | 14 |
4 files changed, 1 insertions, 41 deletions
diff --git a/application/pom.xml b/application/pom.xml index 7c34cd966eb..f5704541308 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -43,16 +43,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>model-integration</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - </exclusion> - <exclusion> - <groupId>org.lz4</groupId> - <artifactId>lz4-java</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index cbe8b4b6d24..f67f33a3b05 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -152,9 +152,9 @@ <include>com.google.protobuf:protobuf-java:${protobuf.vespa.version}:test</include> <include>com.ibm.icu:icu4j:${icu4j.vespa.version}:test</include> <include>com.microsoft.onnxruntime:onnxruntime:${onnxruntime.vespa.version}:test</include> - <include>de.kherud:llama:${kherud.llama.vespa.version}:test</include> <include>com.thaiopensource:jing:20091111:test</include> <include>commons-codec:commons-codec:${commons-codec.vespa.version}:test</include> + <include>de.kherud:llama:${kherud.llama.vespa.version}:test</include> <include>io.airlift:aircompressor:${aircompressor.vespa.version}:test</include> <include>io.airlift:airline:${airline.vespa.version}:test</include> <include>io.prometheus:simpleclient:${prometheus.client.vespa.version}:test</include> diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml index 0aa1627f33e..e2afa0e91f4 100644 --- a/container-search-and-docproc/pom.xml +++ b/container-search-and-docproc/pom.xml @@ -96,22 +96,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>model-integration</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - </exclusion> - <exclusion> - <groupId>org.lz4</groupId> - <artifactId>lz4-java</artifactId> - </exclusion> - </exclusions> - </dependency> <!-- PROVIDED scope --> <dependency> diff --git a/fat-model-dependencies/pom.xml b/fat-model-dependencies/pom.xml index c4ecd3d2e1c..069b53a0dcd 100644 --- a/fat-model-dependencies/pom.xml +++ b/fat-model-dependencies/pom.xml @@ -96,14 +96,6 @@ <groupId>com.theokanning.openai-gpt3-java</groupId> <artifactId>service</artifactId> </exclusion> - <exclusion> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - </exclusion> - <exclusion> - <groupId>org.lz4</groupId> - <artifactId>lz4-java</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -238,12 +230,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>container-search-and-docproc</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>com.yahoo.vespa</groupId> - <artifactId>model-integration</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> |