aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anderson <ejona@google.com>2022-04-25 11:19:03 -0700
committerEric Anderson <ejona@google.com>2022-04-25 11:19:03 -0700
commit3500243f4320fcde1d567184b822c98de017498e (patch)
tree916f6465ee59108b0659f2809dece8dfa528862c
parent15d48747fd72a92049e52d711c1ffe16d02ceba7 (diff)
downloadgrpc-grpc-java-3500243f4320fcde1d567184b822c98de017498e.tar.gz
Bump version to 1.46.0upstream/v1.46.0
-rw-r--r--build.gradle2
-rw-r--r--compiler/src/test/golden/TestDeprecatedService.java.txt2
-rw-r--r--compiler/src/test/golden/TestService.java.txt2
-rw-r--r--compiler/src/testLite/golden/TestDeprecatedService.java.txt2
-rw-r--r--compiler/src/testLite/golden/TestService.java.txt2
-rw-r--r--core/src/main/java/io/grpc/internal/GrpcUtil.java2
-rw-r--r--examples/android/clientcache/app/build.gradle10
-rw-r--r--examples/android/helloworld/app/build.gradle8
-rw-r--r--examples/android/routeguide/app/build.gradle8
-rw-r--r--examples/android/strictmode/app/build.gradle8
-rw-r--r--examples/build.gradle2
-rw-r--r--examples/example-alts/build.gradle2
-rw-r--r--examples/example-gauth/build.gradle2
-rw-r--r--examples/example-gauth/pom.xml4
-rw-r--r--examples/example-hostname/build.gradle2
-rw-r--r--examples/example-hostname/pom.xml4
-rw-r--r--examples/example-jwt-auth/build.gradle2
-rw-r--r--examples/example-jwt-auth/pom.xml4
-rw-r--r--examples/example-tls/build.gradle2
-rw-r--r--examples/example-tls/pom.xml4
-rw-r--r--examples/example-xds/build.gradle2
-rw-r--r--examples/pom.xml4
22 files changed, 40 insertions, 40 deletions
diff --git a/build.gradle b/build.gradle
index 22ba6e6e9..be7f7f47c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ subprojects {
apply plugin: "net.ltgt.errorprone"
group = "io.grpc"
- version = "1.46.0-SNAPSHOT" // CURRENT_GRPC_VERSION
+ version = "1.46.0" // 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
index 8a1cc45e6..e4b311d18 100644
--- 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.46.0-SNAPSHOT)",
+ value = "by gRPC proto compiler (version 1.46.0)",
comments = "Source: grpc/testing/compiler/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
@java.lang.Deprecated
diff --git a/compiler/src/test/golden/TestService.java.txt b/compiler/src/test/golden/TestService.java.txt
index ce1d6ab5b..407ebc9ca 100644
--- 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.46.0-SNAPSHOT)",
+ value = "by gRPC proto compiler (version 1.46.0)",
comments = "Source: grpc/testing/compiler/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
public final class TestServiceGrpc {
diff --git a/compiler/src/testLite/golden/TestDeprecatedService.java.txt b/compiler/src/testLite/golden/TestDeprecatedService.java.txt
index 104cb4363..27e47b672 100644
--- 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.46.0-SNAPSHOT)",
+ value = "by gRPC proto compiler (version 1.46.0)",
comments = "Source: grpc/testing/compiler/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
@java.lang.Deprecated
diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt
index 631611e71..9fdb5d1f5 100644
--- 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.46.0-SNAPSHOT)",
+ value = "by gRPC proto compiler (version 1.46.0)",
comments = "Source: grpc/testing/compiler/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
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
index 0f858c5da..4ebbf28a4 100644
--- a/core/src/main/java/io/grpc/internal/GrpcUtil.java
+++ b/core/src/main/java/io/grpc/internal/GrpcUtil.java
@@ -203,7 +203,7 @@ public final class GrpcUtil {
public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults();
- private static final String IMPLEMENTATION_VERSION = "1.46.0-SNAPSHOT"; // CURRENT_GRPC_VERSION
+ private static final String IMPLEMENTATION_VERSION = "1.46.0"; // 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
index 96cee98a0..cd9e16491 100644
--- 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.19.2' }
plugins {
- grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.46.0' // 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.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
- implementation 'io.grpc:grpc-protobuf-lite:1.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
- implementation 'io.grpc:grpc-stub:1.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ implementation 'io.grpc:grpc-okhttp:1.46.0' // CURRENT_GRPC_VERSION
+ implementation 'io.grpc:grpc-protobuf-lite:1.46.0' // CURRENT_GRPC_VERSION
+ implementation 'io.grpc:grpc-stub:1.46.0' // 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.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ testImplementation 'io.grpc:grpc-testing:1.46.0' // CURRENT_GRPC_VERSION
}
diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle
index 1f40e4ceb..991e1c467 100644
--- 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.19.2' }
plugins {
- grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.46.0' // 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.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
- implementation 'io.grpc:grpc-protobuf-lite:1.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
- implementation 'io.grpc:grpc-stub:1.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ implementation 'io.grpc:grpc-okhttp:1.46.0' // CURRENT_GRPC_VERSION
+ implementation 'io.grpc:grpc-protobuf-lite:1.46.0' // CURRENT_GRPC_VERSION
+ implementation 'io.grpc:grpc-stub:1.46.0' // 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
index e22faf1fe..a15baf32e 100644
--- 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.19.2' }
plugins {
- grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.46.0' // 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.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
- implementation 'io.grpc:grpc-protobuf-lite:1.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
- implementation 'io.grpc:grpc-stub:1.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ implementation 'io.grpc:grpc-okhttp:1.46.0' // CURRENT_GRPC_VERSION
+ implementation 'io.grpc:grpc-protobuf-lite:1.46.0' // CURRENT_GRPC_VERSION
+ implementation 'io.grpc:grpc-stub:1.46.0' // 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
index ff9e69e8c..0373fe4fd 100644
--- 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.19.2' }
plugins {
- grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.46.0' // 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.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
- implementation 'io.grpc:grpc-protobuf-lite:1.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
- implementation 'io.grpc:grpc-stub:1.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ implementation 'io.grpc:grpc-okhttp:1.46.0' // CURRENT_GRPC_VERSION
+ implementation 'io.grpc:grpc-protobuf-lite:1.46.0' // CURRENT_GRPC_VERSION
+ implementation 'io.grpc:grpc-stub:1.46.0' // CURRENT_GRPC_VERSION
implementation 'org.apache.tomcat:annotations-api:6.0.53'
}
diff --git a/examples/build.gradle b/examples/build.gradle
index 65d8aa079..33e097fcb 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -22,7 +22,7 @@ targetCompatibility = 1.8
// 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.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+def grpcVersion = '1.46.0' // CURRENT_GRPC_VERSION
def protobufVersion = '3.19.2'
def protocVersion = protobufVersion
diff --git a/examples/example-alts/build.gradle b/examples/example-alts/build.gradle
index ccded502e..fc255037f 100644
--- a/examples/example-alts/build.gradle
+++ b/examples/example-alts/build.gradle
@@ -23,7 +23,7 @@ targetCompatibility = 1.8
// 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.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+def grpcVersion = '1.46.0' // CURRENT_GRPC_VERSION
def protocVersion = '3.19.2'
dependencies {
diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle
index 9c98bbfc0..11687d46b 100644
--- a/examples/example-gauth/build.gradle
+++ b/examples/example-gauth/build.gradle
@@ -23,7 +23,7 @@ targetCompatibility = 1.8
// 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.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+def grpcVersion = '1.46.0' // CURRENT_GRPC_VERSION
def protobufVersion = '3.19.2'
def protocVersion = protobufVersion
diff --git a/examples/example-gauth/pom.xml b/examples/example-gauth/pom.xml
index b82954017..726389c95 100644
--- 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.46.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
+ <version>1.46.0</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.46.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
+ <grpc.version>1.46.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.19.2</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
index 25b753f65..6a2168a46 100644
--- a/examples/example-hostname/build.gradle
+++ b/examples/example-hostname/build.gradle
@@ -21,7 +21,7 @@ targetCompatibility = 1.8
// 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.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+def grpcVersion = '1.46.0' // CURRENT_GRPC_VERSION
def protobufVersion = '3.19.2'
dependencies {
diff --git a/examples/example-hostname/pom.xml b/examples/example-hostname/pom.xml
index 8556ccc9d..1f5b840ce 100644
--- 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.46.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
+ <version>1.46.0</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.46.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
+ <grpc.version>1.46.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protoc.version>3.19.2</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
index f2b33c3f1..0e34f4ab0 100644
--- a/examples/example-jwt-auth/build.gradle
+++ b/examples/example-jwt-auth/build.gradle
@@ -22,7 +22,7 @@ targetCompatibility = 1.8
// 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.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+def grpcVersion = '1.46.0' // CURRENT_GRPC_VERSION
def protobufVersion = '3.19.2'
def protocVersion = protobufVersion
diff --git a/examples/example-jwt-auth/pom.xml b/examples/example-jwt-auth/pom.xml
index 11eedca9d..7f7685105 100644
--- 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.46.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
+ <version>1.46.0</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.46.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
+ <grpc.version>1.46.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.19.2</protobuf.version>
<protoc.version>3.19.2</protoc.version>
<!-- required for jdk9 -->
diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle
index 0c1d065e1..fb6b5c84f 100644
--- a/examples/example-tls/build.gradle
+++ b/examples/example-tls/build.gradle
@@ -23,7 +23,7 @@ targetCompatibility = 1.8
// 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.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+def grpcVersion = '1.46.0' // CURRENT_GRPC_VERSION
def protocVersion = '3.19.2'
dependencies {
diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml
index 2411d2682..f77ffaf37 100644
--- 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.46.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
+ <version>1.46.0</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.46.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
+ <grpc.version>1.46.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protoc.version>3.19.2</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
index abb8fd3b6..27a633c3d 100644
--- a/examples/example-xds/build.gradle
+++ b/examples/example-xds/build.gradle
@@ -22,7 +22,7 @@ targetCompatibility = 1.8
// 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.46.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+def grpcVersion = '1.46.0' // CURRENT_GRPC_VERSION
def nettyTcNativeVersion = '2.0.31.Final'
def protocVersion = '3.19.2'
diff --git a/examples/pom.xml b/examples/pom.xml
index fb83767c8..481587e81 100644
--- 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.46.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
+ <version>1.46.0</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.46.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
+ <grpc.version>1.46.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.19.2</protobuf.version>
<protoc.version>3.19.2</protoc.version>
<!-- required for jdk9 -->