Merge pull request #25236 from vespa-engine/arnej/no-dependency-reduced-pom

Arnej/no dependency reduced pom

6 files changed, 15 insertions, 11 deletions

diff --git a/application/src/test/java/com/yahoo/application/container/ContainerModelEvaluationTest.java b/application/src/test/java/com/yahoo/application/container/ContainerModelEvaluationTest.java
index 656660f7580..f838d7a5481 100644
--- a/application/src/test/java/com/yahoo/application/container/ContainerModelEvaluationTest.java
+++ b/application/src/test/java/com/yahoo/application/container/ContainerModelEvaluationTest.java
@@ -55,19 +55,19 @@ public class ContainerModelEvaluationTest {
 
         {
             String expected = "{\"cells\":[{\"address\":{},\"value\":2.496898}]}";
-            assertResponse("http://localhost/model-evaluation/v1/xgboost_xgboost_2_2/eval", expected, jdisc);
+            assertResponse("http://localhost/model-evaluation/v1/xgboost_xgboost_2_2/eval?format.tensors=long", expected, jdisc);
         }
 
         {
             String expected = "{\"cells\":[{\"address\":{},\"value\":1.9130086820218188}]}";
-            assertResponse("http://localhost/model-evaluation/v1/lightgbm_regression/eval", expected, jdisc);
+            assertResponse("http://localhost/model-evaluation/v1/lightgbm_regression/eval?format.tensors=long", expected, jdisc);
         }
 
         {
             String expected = "{\"cells\":[{\"address\":{\"d0\":\"0\"},\"value\":0.3006095290184021},{\"address\":{\"d0\":\"1\"},\"value\":0.33222490549087524},{\"address\":{\"d0\":\"2\"},\"value\":0.3671652674674988}]}";
-            assertResponse("http://localhost/model-evaluation/v1/onnx_softmax_func/output/eval?input=" + inputTensor(), expected, jdisc);
-            assertResponse("http://localhost/model-evaluation/v1/onnx_softmax_func/default.output/eval?input=" + inputTensor(), expected, jdisc);
-            assertResponse("http://localhost/model-evaluation/v1/onnx_softmax_func/default/output/eval?input=" + inputTensor(), expected, jdisc);
+            assertResponse("http://localhost/model-evaluation/v1/onnx_softmax_func/output/eval?format.tensors=long&input=" + inputTensor(), expected, jdisc);
+            assertResponse("http://localhost/model-evaluation/v1/onnx_softmax_func/default.output/eval?format.tensors=long&input=" + inputTensor(), expected, jdisc);
+            assertResponse("http://localhost/model-evaluation/v1/onnx_softmax_func/default/output/eval?format.tensors=long&input=" + inputTensor(), expected, jdisc);
         }
     }
 
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index 9a640966f6d..fe847d76c08 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -28,6 +28,7 @@
         <httpclient.version>4.5.13</httpclient.version>
         <httpcore.version>4.4.13</httpcore.version>
         <junit5.version>5.8.1</junit5.version>  <!-- TODO: in parent this is named 'junit.version' -->
+        <onnxruntime.version>1.12.1</onnxruntime.version>
         <!-- END parent/pom.xml -->
 
 
@@ -81,6 +82,7 @@
                                         <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-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml
index 8c420328fe2..4dcd24bde65 100644
--- a/container-dependencies-enforcer/pom.xml
+++ b/container-dependencies-enforcer/pom.xml
@@ -68,6 +68,7 @@
                                         <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 e088c40e20b..50cff5e05c3 100644
--- a/container-dev/pom.xml
+++ b/container-dev/pom.xml
@@ -82,12 +82,6 @@
       <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-onnxruntime/pom.xml b/container-onnxruntime/pom.xml
index 854a4571028..59d23e1b8c1 100644
--- a/container-onnxruntime/pom.xml
+++ b/container-onnxruntime/pom.xml
@@ -61,6 +61,7 @@
                       </goals>
                       <configuration>
                          <minimizeJar>false</minimizeJar>
+                         <createDependencyReducedPom>false</createDependencyReducedPom>
                          <filters>
                              <filter>
                                 <artifact>com.microsoft.onnxruntime:*</artifact>
diff --git a/vespaclient-java/pom.xml b/vespaclient-java/pom.xml
index f5856e1d019..99ca84ccce0 100644
--- a/vespaclient-java/pom.xml
+++ b/vespaclient-java/pom.xml
@@ -17,6 +17,12 @@
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>container-dev</artifactId>
 	    <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.microsoft.onnxruntime</groupId>
+                    <artifactId>onnxruntime</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <!-- Due to com.yahoo.search.query.profile.DumpTool and HttpRequest.createTestRequest ... -->