diff options
| author | gjoranv <gjoranv@gmail.com> | 2022-12-14 23:44:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-14 23:44:01 +0100 |
| commit | a5dc4e9c1cf0ecba44a5eebe6e5e003f2e813076 (patch) | |
| tree | 27d522967c6727ef11d3f739bffa8acf5b2b0650 | |
| parent | 2dd525e13aebe65ce6dd9258d7f9cbea1f75626c (diff) | |
| parent | 848235b7538a3223e288ebc227ef8b100929ec52 (diff) | |
Merge pull request #25259 from vespa-engine/onnxruntime-test-scopev8.100.20
Move microsoft.onnxruntime from provided to test scope.
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 1 | ||||
| -rw-r--r-- | container-dev/pom.xml | 6 | ||||
| -rw-r--r-- | container-test/pom.xml | 4 |
4 files changed, 11 insertions, 2 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index fe847d76c08..5fa5f9ff9eb 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -82,7 +82,6 @@ <include>com.fasterxml.jackson.core:jackson-databind:${jackson-databind.version}:provided</include> <include>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2.version}:provided</include> <include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson2.version}:provided</include> - <include>com.microsoft.onnxruntime:onnxruntime:jar:${onnxruntime.version}:provided</include> <!-- Guava with its internal dependencies --> <include>com.google.guava:guava:${guava.version}:provided</include> @@ -176,6 +175,7 @@ <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> + <include>com.microsoft.onnxruntime:onnxruntime:jar:${onnxruntime.version}:test</include> <include>com.thaiopensource:jing:20091111:test</include> <include>commons-codec:commons-codec:${commons-codec.version}:test</include> <include>io.airlift:aircompressor:0.21:test</include> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 4dcd24bde65..8c420328fe2 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -68,7 +68,6 @@ <include>com.fasterxml.jackson.core:jackson-databind:${jackson-databind.version}:provided</include> <include>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2.version}:provided</include> <include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson2.version}:provided</include> - <include>com.microsoft.onnxruntime:onnxruntime:jar:${onnxruntime.version}:provided</include> <!-- Guava with its internal dependencies --> <include>com.google.guava:guava:${guava.version}:provided</include> diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 50cff5e05c3..e088c40e20b 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -82,6 +82,12 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>container-onnxruntime</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>com.microsoft.onnxruntime</groupId> + <artifactId>onnxruntime</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/container-test/pom.xml b/container-test/pom.xml index 103c118b083..829372ea8fb 100644 --- a/container-test/pom.xml +++ b/container-test/pom.xml @@ -51,6 +51,10 @@ <artifactId>icu4j</artifactId> </dependency> <dependency> + <groupId>com.microsoft.onnxruntime</groupId> + <artifactId>onnxruntime</artifactId> + </dependency> + <dependency> <groupId>io.airlift</groupId> <artifactId>airline</artifactId> <exclusions> |