From 308a7c730e9684f5fa70a6edbd189f50c6251919 Mon Sep 17 00:00:00 2001 From: Spencer Fang Date: Wed, 30 Aug 2017 13:53:53 -0700 Subject: [PATCH] Bump version to 1.6.1 --- android-interop-testing/app/build.gradle | 10 +++++----- .../io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java | 2 +- .../benchmarks/proto/ReportQpsScenarioServiceGrpc.java | 2 +- .../io/grpc/benchmarks/proto/WorkerServiceGrpc.java | 2 +- build.gradle | 2 +- compiler/src/test/golden/TestService.java.txt | 2 +- compiler/src/testLite/golden/TestService.java.txt | 2 +- compiler/src/testNano/golden/TestService.java.txt | 2 +- examples/android/helloworld/app/build.gradle | 8 ++++---- examples/android/routeguide/app/build.gradle | 8 ++++---- examples/build.gradle | 2 +- examples/pom.xml | 4 ++-- examples/thrift/build.gradle | 2 +- .../main/grpc/io/grpc/grpclb/LoadBalancerGrpc.java | 2 +- .../grpc/testing/integration/MetricsServiceGrpc.java | 2 +- .../grpc/testing/integration/ReconnectServiceGrpc.java | 2 +- .../io/grpc/testing/integration/TestServiceGrpc.java | 2 +- .../testing/integration/UnimplementedServiceGrpc.java | 2 +- .../main/grpc/io/grpc/health/v1/HealthGrpc.java | 2 +- .../grpc/instrumentation/v1alpha/MonitoringGrpc.java | 2 +- .../grpc/reflection/v1alpha/ServerReflectionGrpc.java | 2 +- .../reflection/testing/AnotherDynamicServiceGrpc.java | 2 +- .../io/grpc/reflection/testing/DynamicServiceGrpc.java | 2 +- .../reflection/testing/ReflectableServiceGrpc.java | 2 +- .../io/grpc/testing/protobuf/SimpleServiceGrpc.java | 2 +- 25 files changed, 36 insertions(+), 36 deletions(-) diff --git a/android-interop-testing/app/build.gradle b/android-interop-testing/app/build.gradle index ad407e81624..0115989eef7 100644 --- a/android-interop-testing/app/build.gradle +++ b/android-interop-testing/app/build.gradle @@ -33,7 +33,7 @@ protobuf { } plugins { grpc { - artifact = 'io.grpc:protoc-gen-grpc-java:1.6.1-SNAPSHOT' // CURRENT_GRPC_VERSION + artifact = 'io.grpc:protoc-gen-grpc-java:1.6.1' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -60,10 +60,10 @@ dependencies { compile 'com.android.support:support-annotations:23.1.1' compile 'com.google.android.gms:play-services-base:7.3.0' // You need to build grpc-java to obtain the grpc libraries below. - compile 'io.grpc:grpc-protobuf-nano:1.6.1-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-okhttp:1.6.1-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-stub:1.6.1-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-testing:1.6.1-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-protobuf-nano:1.6.1' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-okhttp:1.6.1' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-stub:1.6.1' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-testing:1.6.1' // CURRENT_GRPC_VERSION compile 'javax.annotation:javax.annotation-api:1.2' compile 'junit:junit:4.12' diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java index 57092110e8e..40a1de7e8dc 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java @@ -18,7 +18,7 @@ /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.6.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.1)", comments = "Source: services.proto") public final class BenchmarkServiceGrpc { diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java index 468d3d33faf..8aaeecdb1c7 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java @@ -18,7 +18,7 @@ /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.6.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.1)", comments = "Source: services.proto") public final class ReportQpsScenarioServiceGrpc { diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java index 64115b956a5..9cfad3cc86d 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java @@ -18,7 +18,7 @@ /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.6.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.1)", comments = "Source: services.proto") public final class WorkerServiceGrpc { diff --git a/build.gradle b/build.gradle index b39b13174b0..5a5ace91f29 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ subprojects { idea.module.inheritOutputDirs = true group = "io.grpc" - version = "1.6.1-SNAPSHOT" // CURRENT_GRPC_VERSION + version = "1.6.1" // CURRENT_GRPC_VERSION sourceCompatibility = 1.6 targetCompatibility = 1.6 diff --git a/compiler/src/test/golden/TestService.java.txt b/compiler/src/test/golden/TestService.java.txt index 72379a902d4..cd08a9745f4 100644 --- a/compiler/src/test/golden/TestService.java.txt +++ b/compiler/src/test/golden/TestService.java.txt @@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.6.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.1)", comments = "Source: test.proto") public final class TestServiceGrpc { diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt index 554f40ef253..15244579b98 100644 --- a/compiler/src/testLite/golden/TestService.java.txt +++ b/compiler/src/testLite/golden/TestService.java.txt @@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.6.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.1)", comments = "Source: test.proto") public final class TestServiceGrpc { diff --git a/compiler/src/testNano/golden/TestService.java.txt b/compiler/src/testNano/golden/TestService.java.txt index 7197b71ae17..184510256c3 100644 --- a/compiler/src/testNano/golden/TestService.java.txt +++ b/compiler/src/testNano/golden/TestService.java.txt @@ -23,7 +23,7 @@ import java.io.IOException; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.6.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.1)", comments = "Source: test.proto") public final class TestServiceGrpc { diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index 3c9d8757f77..3440b293cc7 100644 --- a/examples/android/helloworld/app/build.gradle +++ b/examples/android/helloworld/app/build.gradle @@ -34,7 +34,7 @@ protobuf { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } grpc { - artifact = 'io.grpc:protoc-gen-grpc-java:1.6.1-SNAPSHOT' // CURRENT_GRPC_VERSION + artifact = 'io.grpc:protoc-gen-grpc-java:1.6.1' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -54,8 +54,8 @@ dependencies { compile 'com.android.support:appcompat-v7:22.1.1' // You need to build grpc-java to obtain these libraries below. - compile 'io.grpc:grpc-okhttp:1.6.1-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-protobuf-lite:1.6.1-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-stub:1.6.1-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-okhttp:1.6.1' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-protobuf-lite:1.6.1' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-stub:1.6.1' // CURRENT_GRPC_VERSION compile 'javax.annotation:javax.annotation-api:1.2' } diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle index 33683c700fb..75570a87c99 100644 --- a/examples/android/routeguide/app/build.gradle +++ b/examples/android/routeguide/app/build.gradle @@ -32,7 +32,7 @@ protobuf { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } grpc { - artifact = 'io.grpc:protoc-gen-grpc-java:1.6.1-SNAPSHOT' // CURRENT_GRPC_VERSION + artifact = 'io.grpc:protoc-gen-grpc-java:1.6.1' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -52,8 +52,8 @@ dependencies { compile 'com.android.support:appcompat-v7:23.+' // You need to build grpc-java to obtain these libraries below. - compile 'io.grpc:grpc-okhttp:1.6.1-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-protobuf-lite:1.6.1-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-stub:1.6.1-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-okhttp:1.6.1' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-protobuf-lite:1.6.1' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-stub:1.6.1' // CURRENT_GRPC_VERSION compile 'javax.annotation:javax.annotation-api:1.2' } diff --git a/examples/build.gradle b/examples/build.gradle index cad32bd8fa1..ac676b02f33 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -22,7 +22,7 @@ repositories { // 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.6.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.6.1' // CURRENT_GRPC_VERSION dependencies { compile "com.google.api.grpc:proto-google-common-protos:0.1.9" diff --git a/examples/pom.xml b/examples/pom.xml index aede92ad94c..12a96165f00 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,11 +6,11 @@ jar - 1.6.1-SNAPSHOT + 1.6.1 examples http://maven.apache.org - 1.6.1-SNAPSHOT + 1.6.1 diff --git a/examples/thrift/build.gradle b/examples/thrift/build.gradle index ed04b984aa9..9e500fe4f62 100644 --- a/examples/thrift/build.gradle +++ b/examples/thrift/build.gradle @@ -12,7 +12,7 @@ repositories { // 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.6.1-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.6.1' // CURRENT_GRPC_VERSION dependencies { compile "io.grpc:grpc-stub:${grpcVersion}" diff --git a/grpclb/src/generated/main/grpc/io/grpc/grpclb/LoadBalancerGrpc.java b/grpclb/src/generated/main/grpc/io/grpc/grpclb/LoadBalancerGrpc.java index 13a26618985..3685e5fb8d3 100644 --- a/grpclb/src/generated/main/grpc/io/grpc/grpclb/LoadBalancerGrpc.java +++ b/grpclb/src/generated/main/grpc/io/grpc/grpclb/LoadBalancerGrpc.java @@ -18,7 +18,7 @@ /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.6.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.1)", comments = "Source: load_balancer.proto") public final class LoadBalancerGrpc { diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java index 28eed80dd73..846227c3688 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java @@ -18,7 +18,7 @@ /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.6.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.1)", comments = "Source: io/grpc/testing/integration/metrics.proto") public final class MetricsServiceGrpc { diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java index 86e044b1e3f..b76c4fff96f 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java @@ -21,7 +21,7 @@ * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.6.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.1)", comments = "Source: io/grpc/testing/integration/test.proto") public final class ReconnectServiceGrpc { diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java index 46c32bf3041..b00f7394f0d 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -22,7 +22,7 @@ * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.6.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.1)", comments = "Source: io/grpc/testing/integration/test.proto") public final class TestServiceGrpc { diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java index 89f6637fbe5..bbe450da9de 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java @@ -22,7 +22,7 @@ * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.6.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.1)", comments = "Source: io/grpc/testing/integration/test.proto") public final class UnimplementedServiceGrpc { diff --git a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java index fe80676d7dc..f4002384f8a 100644 --- a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java @@ -18,7 +18,7 @@ /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.6.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.1)", comments = "Source: health.proto") public final class HealthGrpc { diff --git a/services/src/generated/main/grpc/io/grpc/instrumentation/v1alpha/MonitoringGrpc.java b/services/src/generated/main/grpc/io/grpc/instrumentation/v1alpha/MonitoringGrpc.java index ab8eb8d0ffb..a464e836734 100644 --- a/services/src/generated/main/grpc/io/grpc/instrumentation/v1alpha/MonitoringGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/instrumentation/v1alpha/MonitoringGrpc.java @@ -18,7 +18,7 @@ /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.6.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.1)", comments = "Source: grpc/instrumentation/v1alpha/monitoring.proto") public final class MonitoringGrpc { diff --git a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java index 161c90eeb48..02978bb7e6e 100644 --- a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java @@ -18,7 +18,7 @@ /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.6.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.1)", comments = "Source: io/grpc/reflection/v1alpha/reflection.proto") public final class ServerReflectionGrpc { diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java index 386bad0b085..12ff021843c 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java @@ -21,7 +21,7 @@ * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.6.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.1)", comments = "Source: io/grpc/reflection/testing/dynamic_reflection_test.proto") public final class AnotherDynamicServiceGrpc { diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java index 2bc146ce4ba..5fbd7501677 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java @@ -21,7 +21,7 @@ * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.6.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.1)", comments = "Source: io/grpc/reflection/testing/dynamic_reflection_test.proto") public final class DynamicServiceGrpc { diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java index 42910bc4766..42ebc17fc7e 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java @@ -18,7 +18,7 @@ /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.6.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.1)", comments = "Source: io/grpc/reflection/testing/reflection_test.proto") public final class ReflectableServiceGrpc { diff --git a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java index 9d69d3af1e4..f1ff530f875 100644 --- a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java +++ b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java @@ -21,7 +21,7 @@ * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.6.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.1)", comments = "Source: io/grpc/testing/protobuf/simpleservice.proto") public final class SimpleServiceGrpc {