diff options
| author | Jon Bratseth <bratseth@oath.com> | 2018-11-15 14:38:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-15 14:38:30 +0100 |
| commit | 9bf95bc2ce97de21f094a34c518484dde6f220bd (patch) | |
| tree | 064d477ae9df5d64b0d023f23bba9146a7b88d20 | |
| parent | 31a7f27dcf8626f3b8e93b38d810591dd56bfc8e (diff) | |
| parent | 1a0b07ad90f9ff6692d331efaddf7b8444398233 (diff) | |
Merge pull request #7671 from vespa-engine/bratseth/upgrade-tf-in-configserver
Use TF 1.11.0 everywhere
| -rw-r--r-- | config-model/pom.xml | 2 | ||||
| -rw-r--r-- | parent/pom.xml | 11 | ||||
| -rw-r--r-- | 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> |