diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2018-01-18 10:55:42 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2018-01-18 10:55:42 +0100 |
| commit | 6de3ab257844f987f84a39195e4c68c74d2a739d (patch) | |
| tree | fb48789dd531dabb8dd3074a382643fd328f82ca | |
| parent | 37d6a6f18c8df8ba747f302f6ad7aa35406250ab (diff) | |
Use protobuf 3.4.0 by default
| -rw-r--r-- | config-model/pom.xml | 1 | ||||
| -rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java | 2 | ||||
| -rw-r--r-- | parent/pom.xml | 2 | ||||
| -rw-r--r-- | searchlib/pom.xml | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/config-model/pom.xml b/config-model/pom.xml index 1e673578968..c159d00eb24 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -312,7 +312,6 @@ <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> - <version>3.4.0</version> </dependency> <dependency> <groupId>org.tensorflow</groupId> diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java index 20f2d0dc613..2e077dd1d6d 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java @@ -15,7 +15,7 @@ import java.util.Properties; import java.util.jar.JarInputStream; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> + * @author Simon Thoresen Hult */ public class ExportPackages { diff --git a/parent/pom.xml b/parent/pom.xml index 916b6b450c2..de02f5085ea 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -403,7 +403,7 @@ <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> - <version>2.4.1</version> + <version>3.4.0</version> </dependency> <dependency> <groupId>com.googlecode.jmockit</groupId> diff --git a/searchlib/pom.xml b/searchlib/pom.xml index 09ccf9928b7..cc955195a5f 100644 --- a/searchlib/pom.xml +++ b/searchlib/pom.xml @@ -38,7 +38,6 @@ <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> - <version>3.4.0</version> </dependency> <dependency> <groupId>org.tensorflow</groupId> |