From 1a0b07ad90f9ff6692d331efaddf7b8444398233 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@oath.com>
Date: Thu, 15 Nov 2018 13:48:43 +0100
Subject: Use TF 1.11.0 everywhere

---
 config-model/pom.xml |  2 --
 parent/pom.xml       | 11 +++++++++++
 searchlib/pom.xml    |  2 --
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/config-model/pom.xml b/config-model/pom.xml
index e8415b3a67b..a65a6a836ed 100644
--- a/config-model/pom.xml
+++ b/config-model/pom.xml
@@ -299,12 +299,10 @@
     <dependency>
       <groupId>org.tensorflow</groupId>
       <artifactId>proto</artifactId>
-      <version>1.6.0</version>
     </dependency>
     <dependency>
       <groupId>org.tensorflow</groupId>
       <artifactId>tensorflow</artifactId>
-      <version>1.6.0</version>
     </dependency>
   </dependencies>
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 4f4fa64dc31..3a0d568a878 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -678,6 +678,16 @@
                 <artifactId>jna</artifactId>
                 <version>${jna.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.tensorflow</groupId>
+                <artifactId>proto</artifactId>
+                <version>${tensorflow.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.tensorflow</groupId>
+                <artifactId>tensorflow</artifactId>
+                <version>${tensorflow.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -686,6 +696,7 @@
         <antlr4.version>4.5</antlr4.version>
         <asm.version>6.2</asm.version>
         <jna.version>4.5.2</jna.version>
+        <tensorflow.version>1.11.0</tensorflow.version>
         <!-- Athenz dependencies. Make sure these dependencies matches those in Vespa's internal repositories -->
         <athenz.version>1.7.43</athenz.version>
         <commons-lang.version>2.6</commons-lang.version>
diff --git a/searchlib/pom.xml b/searchlib/pom.xml
index 3d5d8ee8e20..f1be4e96269 100644
--- a/searchlib/pom.xml
+++ b/searchlib/pom.xml
@@ -41,12 +41,10 @@
     <dependency>
       <groupId>org.tensorflow</groupId>
       <artifactId>proto</artifactId>
-      <version>1.11.0</version>
     </dependency>
     <dependency>
       <groupId>org.tensorflow</groupId>
       <artifactId>tensorflow</artifactId>
-      <version>1.11.0</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
-- 
cgit v1.2.3