aboutsummaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorEric Anderson <ejona@google.com>2016-10-24 14:59:24 -0700
committerEric Anderson <ejona@google.com>2016-11-01 14:52:56 -0700
commitc38611a230e43023c63abd9cf45fcaed5eb28a89 (patch)
tree19f94614650811851328d271b90579d87a614ba3 /README.md
parent483662e24dd29c105584717914fb0f75d4609c70 (diff)
downloadgrpc-grpc-java-c38611a230e43023c63abd9cf45fcaed5eb28a89.tar.gz
Bump protobuf to 3.1.0
Also removed warnings about protoc version matching runtime, since this is no longer supposed to be a problem (starting with 3.0.0-beta-4) and all our tests ran fine when using protoc 3.0.2 with protobuf runtime 3.1.0. Fixes #2316
Diffstat (limited to 'README.md')
-rw-r--r--README.md12
1 files changed, 2 insertions, 10 deletions
diff --git a/README.md b/README.md
index 5bc9cc67f..7fa1b3121 100644
--- a/README.md
+++ b/README.md
@@ -82,12 +82,7 @@ For protobuf-based codegen integrated with the Maven build system, you can use
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.5.0</version>
<configuration>
- <!--
- The version of protoc must match protobuf-java. If you don't depend on
- protobuf-java directly, you will be transitively depending on the
- protobuf-java version that grpc depends on.
- -->
- <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact>
+ <protocArtifact>com.google.protobuf:protoc:3.1.0:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
@@ -125,10 +120,7 @@ buildscript {
protobuf {
protoc {
- // The version of protoc must match protobuf-java. If you don't depend on
- // protobuf-java directly, you will be transitively depending on the
- // protobuf-java version that grpc depends on.
- artifact = "com.google.protobuf:protoc:3.0.2"
+ artifact = "com.google.protobuf:protoc:3.1.0"
}
plugins {
grpc {