Start 1.39.0 development cycle (#8147)

ericgribkoff · web-flow · commit c0eca6de252c · 2021-05-05T16:30:38.000-07:00
diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ subprojects {
     apply plugin: "net.ltgt.errorprone"
 
     group = "io.grpc"
-    version = "1.38.0-SNAPSHOT" // CURRENT_GRPC_VERSION
+    version = "1.39.0-SNAPSHOT" // CURRENT_GRPC_VERSION
 
     repositories {
         maven { // The google mirror is less flaky than mavenCentral()
diff --git a/compiler/src/test/golden/TestDeprecatedService.java.txt b/compiler/src/test/golden/TestDeprecatedService.java.txt
@@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
  * </pre>
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.38.0-SNAPSHOT)",
+    value = "by gRPC proto compiler (version 1.39.0-SNAPSHOT)",
     comments = "Source: grpc/testing/compiler/test.proto")
 @java.lang.Deprecated
 public final class TestDeprecatedServiceGrpc {
diff --git a/compiler/src/test/golden/TestService.java.txt b/compiler/src/test/golden/TestService.java.txt
@@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
  * </pre>
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.38.0-SNAPSHOT)",
+    value = "by gRPC proto compiler (version 1.39.0-SNAPSHOT)",
     comments = "Source: grpc/testing/compiler/test.proto")
 public final class TestServiceGrpc {
 
diff --git a/compiler/src/testLite/golden/TestDeprecatedService.java.txt b/compiler/src/testLite/golden/TestDeprecatedService.java.txt
@@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
  * </pre>
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.38.0-SNAPSHOT)",
+    value = "by gRPC proto compiler (version 1.39.0-SNAPSHOT)",
     comments = "Source: grpc/testing/compiler/test.proto")
 @java.lang.Deprecated
 public final class TestDeprecatedServiceGrpc {
diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt
@@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
  * </pre>
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.38.0-SNAPSHOT)",
+    value = "by gRPC proto compiler (version 1.39.0-SNAPSHOT)",
     comments = "Source: grpc/testing/compiler/test.proto")
 public final class TestServiceGrpc {
 
diff --git a/core/src/main/java/io/grpc/internal/GrpcUtil.java b/core/src/main/java/io/grpc/internal/GrpcUtil.java
@@ -197,7 +197,7 @@ public byte[] parseAsciiString(byte[] serialized) {
 
   public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults();
 
-  private static final String IMPLEMENTATION_VERSION = "1.38.0-SNAPSHOT"; // CURRENT_GRPC_VERSION
+  private static final String IMPLEMENTATION_VERSION = "1.39.0-SNAPSHOT"; // CURRENT_GRPC_VERSION
 
   /**
    * The default timeout in nanos for a keepalive ping request.
diff --git a/examples/android/clientcache/app/build.gradle b/examples/android/clientcache/app/build.gradle
@@ -34,7 +34,7 @@ android {
 protobuf {
     protoc { artifact = 'com.google.protobuf:protoc:3.12.0' }
     plugins {
-        grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+        grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
         }
     }
     generateProtoTasks {
@@ -54,12 +54,12 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:27.0.2'
 
     // You need to build grpc-java to obtain these libraries below.
-    implementation 'io.grpc:grpc-okhttp:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-    implementation 'io.grpc:grpc-protobuf-lite:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-    implementation 'io.grpc:grpc-stub:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+    implementation 'io.grpc:grpc-okhttp:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+    implementation 'io.grpc:grpc-protobuf-lite:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+    implementation 'io.grpc:grpc-stub:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
     implementation 'org.apache.tomcat:annotations-api:6.0.53'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'com.google.truth:truth:1.0.1'
-    testImplementation 'io.grpc:grpc-testing:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+    testImplementation 'io.grpc:grpc-testing:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
 }
diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle
@@ -32,7 +32,7 @@ android {
 protobuf {
     protoc { artifact = 'com.google.protobuf:protoc:3.12.0' }
     plugins {
-        grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+        grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
         }
     }
     generateProtoTasks {
@@ -52,8 +52,8 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:27.0.2'
 
     // You need to build grpc-java to obtain these libraries below.
-    implementation 'io.grpc:grpc-okhttp:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-    implementation 'io.grpc:grpc-protobuf-lite:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-    implementation 'io.grpc:grpc-stub:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+    implementation 'io.grpc:grpc-okhttp:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+    implementation 'io.grpc:grpc-protobuf-lite:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+    implementation 'io.grpc:grpc-stub:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
     implementation 'org.apache.tomcat:annotations-api:6.0.53'
 }
diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle
@@ -32,7 +32,7 @@ android {
 protobuf {
     protoc { artifact = 'com.google.protobuf:protoc:3.12.0' }
     plugins {
-        grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+        grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
         }
     }
     generateProtoTasks {
@@ -52,8 +52,8 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:27.0.2'
 
     // You need to build grpc-java to obtain these libraries below.
-    implementation 'io.grpc:grpc-okhttp:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-    implementation 'io.grpc:grpc-protobuf-lite:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-    implementation 'io.grpc:grpc-stub:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+    implementation 'io.grpc:grpc-okhttp:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+    implementation 'io.grpc:grpc-protobuf-lite:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+    implementation 'io.grpc:grpc-stub:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
     implementation 'org.apache.tomcat:annotations-api:6.0.53'
 }
diff --git a/examples/android/strictmode/app/build.gradle b/examples/android/strictmode/app/build.gradle
@@ -33,7 +33,7 @@ android {
 protobuf {
     protoc { artifact = 'com.google.protobuf:protoc:3.12.0' }
     plugins {
-        grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+        grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
         }
     }
     generateProtoTasks {
@@ -53,8 +53,8 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:28.0.0'
 
     // You need to build grpc-java to obtain these libraries below.
-    implementation 'io.grpc:grpc-okhttp:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-    implementation 'io.grpc:grpc-protobuf-lite:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-    implementation 'io.grpc:grpc-stub:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+    implementation 'io.grpc:grpc-okhttp:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+    implementation 'io.grpc:grpc-protobuf-lite:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+    implementation 'io.grpc:grpc-stub:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
     implementation 'org.apache.tomcat:annotations-api:6.0.53'
 }
diff --git a/examples/build.gradle b/examples/build.gradle
@@ -22,7 +22,7 @@ targetCompatibility = 1.7
 
 // Feel free to delete the comment at the next line. It is just for safely
 // updating the version in our release process.
-def grpcVersion = '1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+def grpcVersion = '1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
 def protobufVersion = '3.12.0'
 def protocVersion = protobufVersion
 
diff --git a/examples/example-alts/build.gradle b/examples/example-alts/build.gradle
@@ -23,7 +23,7 @@ targetCompatibility = 1.7
 
 // Feel free to delete the comment at the next line. It is just for safely
 // updating the version in our release process.
-def grpcVersion = '1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+def grpcVersion = '1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
 def protocVersion = '3.12.0'
 
 dependencies {
diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle
@@ -23,7 +23,7 @@ targetCompatibility = 1.7
 
 // Feel free to delete the comment at the next line. It is just for safely
 // updating the version in our release process.
-def grpcVersion = '1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+def grpcVersion = '1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
 def protobufVersion = '3.12.0'
 def protocVersion = protobufVersion
 
diff --git a/examples/example-gauth/pom.xml b/examples/example-gauth/pom.xml
@@ -6,13 +6,13 @@
   <packaging>jar</packaging>
   <!-- Feel free to delete the comment at the end of these lines. It is just
        for safely updating the version in our release process. -->
-  <version>1.38.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
+  <version>1.39.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
   <name>example-gauth</name>
   <url>https://github.com/grpc/grpc-java</url>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <grpc.version>1.38.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
+    <grpc.version>1.39.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
     <protobuf.version>3.12.0</protobuf.version>
     <!-- required for jdk9 -->
     <maven.compiler.source>1.7</maven.compiler.source>
diff --git a/examples/example-hostname/build.gradle b/examples/example-hostname/build.gradle
@@ -21,7 +21,7 @@ targetCompatibility = 1.7
 
 // Feel free to delete the comment at the next line. It is just for safely
 // updating the version in our release process.
-def grpcVersion = '1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+def grpcVersion = '1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
 def protobufVersion = '3.12.0'
 
 dependencies {
diff --git a/examples/example-hostname/pom.xml b/examples/example-hostname/pom.xml
@@ -6,13 +6,13 @@
   <packaging>jar</packaging>
   <!-- Feel free to delete the comment at the end of these lines. It is just
        for safely updating the version in our release process. -->
-  <version>1.38.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
+  <version>1.39.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
   <name>example-hostname</name>
   <url>https://github.com/grpc/grpc-java</url>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <grpc.version>1.38.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
+    <grpc.version>1.39.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
     <protoc.version>3.12.0</protoc.version>
     <!-- required for jdk9 -->
     <maven.compiler.source>1.7</maven.compiler.source>
diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle
@@ -22,7 +22,7 @@ targetCompatibility = 1.7
 
 // Feel free to delete the comment at the next line. It is just for safely
 // updating the version in our release process.
-def grpcVersion = '1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+def grpcVersion = '1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
 def protobufVersion = '3.12.0'
 def protocVersion = protobufVersion
 
diff --git a/examples/example-jwt-auth/pom.xml b/examples/example-jwt-auth/pom.xml
@@ -7,13 +7,13 @@
   <packaging>jar</packaging>
   <!-- Feel free to delete the comment at the end of these lines. It is just
        for safely updating the version in our release process. -->
-  <version>1.38.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
+  <version>1.39.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
   <name>example-jwt-auth</name>
   <url>https://github.com/grpc/grpc-java</url>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <grpc.version>1.38.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
+    <grpc.version>1.39.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
     <protobuf.version>3.12.0</protobuf.version>
     <protoc.version>3.12.0</protoc.version>
     <!-- required for jdk9 -->
diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle
@@ -23,7 +23,7 @@ targetCompatibility = 1.7
 
 // Feel free to delete the comment at the next line. It is just for safely
 // updating the version in our release process.
-def grpcVersion = '1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+def grpcVersion = '1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
 def protocVersion = '3.12.0'
 
 dependencies {
diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml
@@ -6,13 +6,13 @@
   <packaging>jar</packaging>
   <!-- Feel free to delete the comment at the end of these lines. It is just
        for safely updating the version in our release process. -->
-  <version>1.38.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
+  <version>1.39.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
   <name>example-tls</name>
   <url>https://github.com/grpc/grpc-java</url>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <grpc.version>1.38.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
+    <grpc.version>1.39.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
     <protoc.version>3.12.0</protoc.version>
     <netty.tcnative.version>2.0.34.Final</netty.tcnative.version>
     <!-- required for jdk9 -->
diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle
@@ -22,7 +22,7 @@ targetCompatibility = 1.7
 
 // Feel free to delete the comment at the next line. It is just for safely
 // updating the version in our release process.
-def grpcVersion = '1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+def grpcVersion = '1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION
 def nettyTcNativeVersion = '2.0.31.Final'
 def protocVersion = '3.12.0'
 
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -6,13 +6,13 @@
   <packaging>jar</packaging>
   <!-- Feel free to delete the comment at the end of these lines. It is just
        for safely updating the version in our release process. -->
-  <version>1.38.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
+  <version>1.39.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
   <name>examples</name>
   <url>https://github.com/grpc/grpc-java</url>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <grpc.version>1.38.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
+    <grpc.version>1.39.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
     <protobuf.version>3.12.0</protobuf.version>
     <protoc.version>3.12.0</protoc.version>
     <!-- required for jdk9 -->

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ android {`
`32`	`32`	`protobuf {`
`33`	`33`	`protoc { artifact = 'com.google.protobuf:protoc:3.12.0' }`
`34`	`34`	`plugins {`
`35`		`- grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
	`35`	`+ grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`generateProtoTasks {`
`@@ -52,8 +52,8 @@ dependencies {`
`52`	`52`	`implementation 'com.android.support:appcompat-v7:27.0.2'`
`53`	`53`
`54`	`54`	`// You need to build grpc-java to obtain these libraries below.`
`55`		`- implementation 'io.grpc:grpc-okhttp:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
`56`		`- implementation 'io.grpc:grpc-protobuf-lite:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
`57`		`- implementation 'io.grpc:grpc-stub:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
	`55`	`+ implementation 'io.grpc:grpc-okhttp:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
	`56`	`+ implementation 'io.grpc:grpc-protobuf-lite:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
	`57`	`+ implementation 'io.grpc:grpc-stub:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
`58`	`58`	`implementation 'org.apache.tomcat:annotations-api:6.0.53'`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ android {`
`33`	`33`	`protobuf {`
`34`	`34`	`protoc { artifact = 'com.google.protobuf:protoc:3.12.0' }`
`35`	`35`	`plugins {`
`36`		`- grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
	`36`	`+ grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`generateProtoTasks {`
`@@ -53,8 +53,8 @@ dependencies {`
`53`	`53`	`implementation 'com.android.support:appcompat-v7:28.0.0'`
`54`	`54`
`55`	`55`	`// You need to build grpc-java to obtain these libraries below.`
`56`		`- implementation 'io.grpc:grpc-okhttp:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
`57`		`- implementation 'io.grpc:grpc-protobuf-lite:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
`58`		`- implementation 'io.grpc:grpc-stub:1.38.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
	`56`	`+ implementation 'io.grpc:grpc-okhttp:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
	`57`	`+ implementation 'io.grpc:grpc-protobuf-lite:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
	`58`	`+ implementation 'io.grpc:grpc-stub:1.39.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
`59`	`59`	`implementation 'org.apache.tomcat:annotations-api:6.0.53'`
`60`	`60`	`}`