Skip to content

Commit

Permalink
Bump version to 1.60.2-SNAPSHOT
Browse files Browse the repository at this point in the history
  • Loading branch information
larry-safran committed Dec 20, 2023
1 parent 661dbe3 commit 09952f1
Show file tree
Hide file tree
Showing 30 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ subprojects {
apply plugin: "net.ltgt.errorprone"

group = "io.grpc"
version = "1.60.1-SNAPSHOT" // CURRENT_GRPC_VERSION
version = "1.60.1" // CURRENT_GRPC_VERSION

repositories {
maven { // The google mirror is less flaky than mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/test/golden/TestDeprecatedService.java.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
* </pre>
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.60.1-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.60.1)",
comments = "Source: grpc/testing/compiler/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
@java.lang.Deprecated
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/test/golden/TestService.java.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
* </pre>
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.60.1-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.60.1)",
comments = "Source: grpc/testing/compiler/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
public final class TestServiceGrpc {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
* </pre>
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.60.1-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.60.1)",
comments = "Source: grpc/testing/compiler/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
@java.lang.Deprecated
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/testLite/golden/TestService.java.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
* </pre>
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.60.1-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.60.1)",
comments = "Source: grpc/testing/compiler/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
public final class TestServiceGrpc {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/io/grpc/internal/GrpcUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ public byte[] parseAsciiString(byte[] serialized) {

public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults();

public static final String IMPLEMENTATION_VERSION = "1.60.1-SNAPSHOT"; // CURRENT_GRPC_VERSION
public static final String IMPLEMENTATION_VERSION = "1.60.1"; // CURRENT_GRPC_VERSION

/**
* The default timeout in nanos for a keepalive ping request.
Expand Down
10 changes: 5 additions & 5 deletions examples/android/clientcache/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ android {
protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.24.0' }
plugins {
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.1' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
Expand All @@ -54,12 +54,12 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.0.0'

// You need to build grpc-java to obtain these libraries below.
implementation 'io.grpc:grpc-okhttp:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-okhttp:1.60.1' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.60.1' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.60.1' // CURRENT_GRPC_VERSION
implementation 'org.apache.tomcat:annotations-api:6.0.53'

testImplementation 'junit:junit:4.13.2'
testImplementation 'com.google.truth:truth:1.0.1'
testImplementation 'io.grpc:grpc-testing:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
testImplementation 'io.grpc:grpc-testing:1.60.1' // CURRENT_GRPC_VERSION
}
8 changes: 4 additions & 4 deletions examples/android/helloworld/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ android {
protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.24.0' }
plugins {
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.1' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
Expand All @@ -52,8 +52,8 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.0.0'

// You need to build grpc-java to obtain these libraries below.
implementation 'io.grpc:grpc-okhttp:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-okhttp:1.60.1' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.60.1' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.60.1' // CURRENT_GRPC_VERSION
implementation 'org.apache.tomcat:annotations-api:6.0.53'
}
8 changes: 4 additions & 4 deletions examples/android/routeguide/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ android {
protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.24.0' }
plugins {
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.1' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
Expand All @@ -52,8 +52,8 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.0.0'

// You need to build grpc-java to obtain these libraries below.
implementation 'io.grpc:grpc-okhttp:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-okhttp:1.60.1' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.60.1' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.60.1' // CURRENT_GRPC_VERSION
implementation 'org.apache.tomcat:annotations-api:6.0.53'
}
8 changes: 4 additions & 4 deletions examples/android/strictmode/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ android {
protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.24.0' }
plugins {
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.60.1' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
Expand All @@ -53,8 +53,8 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.0.0'

// You need to build grpc-java to obtain these libraries below.
implementation 'io.grpc:grpc-okhttp:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-okhttp:1.60.1' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.60.1' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.60.1' // CURRENT_GRPC_VERSION
implementation 'org.apache.tomcat:annotations-api:6.0.53'
}
2 changes: 1 addition & 1 deletion examples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ java {

// 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.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.60.1' // CURRENT_GRPC_VERSION
def protobufVersion = '3.24.0'
def protocVersion = protobufVersion

Expand Down
2 changes: 1 addition & 1 deletion examples/example-alts/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ java {

// 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.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.60.1' // CURRENT_GRPC_VERSION
def protocVersion = '3.24.0'

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion examples/example-debug/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ java {

// 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.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.60.1' // CURRENT_GRPC_VERSION
def protobufVersion = '3.24.0'

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions examples/example-debug/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.60.1-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<version>1.60.1</version><!-- CURRENT_GRPC_VERSION -->
<name>example-debug</name>
<url>https://github.com/grpc/grpc-java</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.60.1-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<grpc.version>1.60.1</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protoc.version>3.24.0</protoc.version>
<!-- required for jdk9 -->
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
2 changes: 1 addition & 1 deletion examples/example-gauth/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ java {

// 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.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.60.1' // CURRENT_GRPC_VERSION
def protobufVersion = '3.24.0'
def protocVersion = protobufVersion

Expand Down
4 changes: 2 additions & 2 deletions examples/example-gauth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.60.1-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<version>1.60.1</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.60.1-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<grpc.version>1.60.1</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.24.0</protobuf.version>
<!-- required for jdk9 -->
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
2 changes: 1 addition & 1 deletion examples/example-gcp-observability/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ java {

// 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.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.60.1' // CURRENT_GRPC_VERSION
def protocVersion = '3.24.0'

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion examples/example-hostname/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ java {

// 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.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.60.1' // CURRENT_GRPC_VERSION
def protobufVersion = '3.24.0'

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions examples/example-hostname/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.60.1-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<version>1.60.1</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.60.1-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<grpc.version>1.60.1</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protoc.version>3.24.0</protoc.version>
<!-- required for jdk9 -->
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
2 changes: 1 addition & 1 deletion examples/example-jwt-auth/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ java {

// 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.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.60.1' // CURRENT_GRPC_VERSION
def protobufVersion = '3.24.0'
def protocVersion = protobufVersion

Expand Down
4 changes: 2 additions & 2 deletions examples/example-jwt-auth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.60.1-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<version>1.60.1</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.60.1-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<grpc.version>1.60.1</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.24.0</protobuf.version>
<protoc.version>3.24.0</protoc.version>
<!-- required for jdk9 -->
Expand Down
2 changes: 1 addition & 1 deletion examples/example-oauth/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ java {

// 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.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.60.1' // CURRENT_GRPC_VERSION
def protobufVersion = '3.24.0'
def protocVersion = protobufVersion

Expand Down
4 changes: 2 additions & 2 deletions examples/example-oauth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.60.1-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<version>1.60.1</version><!-- CURRENT_GRPC_VERSION -->
<name>example-oauth</name>
<url>https://github.com/grpc/grpc-java</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.60.1-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<grpc.version>1.60.1</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.24.0</protobuf.version>
<protoc.version>3.24.0</protoc.version>
<!-- required for jdk9 -->
Expand Down
2 changes: 1 addition & 1 deletion examples/example-orca/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ java {
targetCompatibility = JavaVersion.VERSION_1_8
}

def grpcVersion = '1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.60.1' // CURRENT_GRPC_VERSION
def protocVersion = '3.24.0'

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion examples/example-reflection/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ java {
targetCompatibility = JavaVersion.VERSION_1_8
}

def grpcVersion = '1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.60.1' // CURRENT_GRPC_VERSION
def protocVersion = '3.24.0'

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion examples/example-servlet/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ java {
targetCompatibility = JavaVersion.VERSION_1_8
}

def grpcVersion = '1.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.60.1' // CURRENT_GRPC_VERSION
def protocVersion = '3.24.0'

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion examples/example-tls/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ java {

// 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.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.60.1' // CURRENT_GRPC_VERSION
def protocVersion = '3.24.0'

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions examples/example-tls/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.60.1-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<version>1.60.1</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.60.1-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<grpc.version>1.60.1</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protoc.version>3.24.0</protoc.version>
<!-- required for jdk9 -->
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
2 changes: 1 addition & 1 deletion examples/example-xds/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ java {

// 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.60.1-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.60.1' // CURRENT_GRPC_VERSION
def protocVersion = '3.24.0'

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.60.1-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<version>1.60.1</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.60.1-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<grpc.version>1.60.1</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.24.0</protobuf.version>
<protoc.version>3.24.0</protoc.version>
<!-- required for JDK 8 -->
Expand Down

0 comments on commit 09952f1

Please sign in to comment.