From 7ce2b4f81dae1fbef5f4eef2f71634d96651e034 Mon Sep 17 00:00:00 2001 From: Carl Mastrangelo Date: Mon, 6 Mar 2017 13:12:44 -0800 Subject: [PATCH] all: start 1.3.0 development cycle --- android-interop-testing/app/build.gradle | 10 +++++----- .../io/grpc/benchmarks/proto/BenchmarkServiceGrpc.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 +- .../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 +- .../grpc/testing/integration/MetricsServiceGrpc.java | 2 +- .../grpc/testing/integration/ReconnectServiceGrpc.java | 2 +- .../io/grpc/testing/integration/TestServiceGrpc.java | 2 +- .../testing/integration/UnimplementedServiceGrpc.java | 2 +- 23 files changed, 34 insertions(+), 34 deletions(-) diff --git a/android-interop-testing/app/build.gradle b/android-interop-testing/app/build.gradle index 4ab70edc71..ea96c0587a 100644 --- a/android-interop-testing/app/build.gradle +++ b/android-interop-testing/app/build.gradle @@ -32,7 +32,7 @@ protobuf { } plugins { grpc { - artifact = 'io.grpc:protoc-gen-grpc-java:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION + artifact = 'io.grpc:protoc-gen-grpc-java:1.3.0-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -58,10 +58,10 @@ dependencies { compile 'com.android.support:appcompat-v7:22.1.1' compile 'com.google.android.gms:play-services-base:7.3.0' // You need to build grpc-java to obtain these libraries below. - compile 'io.grpc:grpc-protobuf-nano:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-okhttp:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-stub:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-testing:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-protobuf-nano:1.3.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-okhttp:1.3.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-stub:1.3.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-testing:1.3.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'javax.annotation:javax.annotation-api:1.2' } 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 e617f60a8c..a1904f5541 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.3.0-SNAPSHOT)", comments = "Source: services.proto") public final class BenchmarkServiceGrpc { 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 9cff56827a..73b6e39271 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.3.0-SNAPSHOT)", comments = "Source: services.proto") public final class WorkerServiceGrpc { diff --git a/build.gradle b/build.gradle index f4ab1f787f..c7085ef902 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ subprojects { } group = "io.grpc" - version = "1.2.0-SNAPSHOT" // CURRENT_GRPC_VERSION + version = "1.3.0-SNAPSHOT" // 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 11b45170ed..f0bfbae10b 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.2.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.3.0-SNAPSHOT)", 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 9be98afa13..c3eee3e589 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.2.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.3.0-SNAPSHOT)", 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 8e0d37a497..14603d72b0 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.2.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.3.0-SNAPSHOT)", 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 0587bc6168..898bed124d 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.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION + artifact = 'io.grpc:protoc-gen-grpc-java:1.3.0-SNAPSHOT' // 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.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-protobuf-lite:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-stub:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-okhttp:1.3.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-protobuf-lite:1.3.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-stub:1.3.0-SNAPSHOT' // 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 739aa4ac6e..eadac70177 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.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION + artifact = 'io.grpc:protoc-gen-grpc-java:1.3.0-SNAPSHOT' // 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.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-protobuf-lite:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-stub:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-okhttp:1.3.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-protobuf-lite:1.3.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-stub:1.3.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'javax.annotation:javax.annotation-api:1.2' } diff --git a/examples/build.gradle b/examples/build.gradle index f71403c7e8..411493be16 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.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.3.0-SNAPSHOT' // CURRENT_GRPC_VERSION dependencies { compile "io.grpc:grpc-netty:${grpcVersion}" diff --git a/examples/pom.xml b/examples/pom.xml index 0f5ba3e59e..bf1d46f680 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,11 +6,11 @@ jar - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT examples http://maven.apache.org - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT diff --git a/examples/thrift/build.gradle b/examples/thrift/build.gradle index 8094f7bee2..6cd2d76d5a 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.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.3.0-SNAPSHOT' // 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 03c2605420..05a8b6bc32 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.3.0-SNAPSHOT)", comments = "Source: load_balancer.proto") public final class LoadBalancerGrpc { 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 7b9fb89c81..c6d634a5c6 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.3.0-SNAPSHOT)", 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 eb9eb45ed9..66caff5069 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.3.0-SNAPSHOT)", 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 0902eab506..27b0711464 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.3.0-SNAPSHOT)", 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 7d5f6ec2a7..c14bc0cbcf 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.3.0-SNAPSHOT)", 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 797417cb44..4d1230838e 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.3.0-SNAPSHOT)", 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 ab063b3f40..0ceda32702 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.3.0-SNAPSHOT)", 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/integration/MetricsServiceGrpc.java b/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java index f8bc5c4ce8..e1f8ba49eb 100644 --- a/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java +++ b/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java @@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.3.0-SNAPSHOT)", comments = "Source: io/grpc/testing/integration/metrics.proto") public final class MetricsServiceGrpc { diff --git a/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java index 5610bad7cb..5ac18629f7 100644 --- a/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java +++ b/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java @@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.3.0-SNAPSHOT)", comments = "Source: io/grpc/testing/integration/test.proto") public final class ReconnectServiceGrpc { diff --git a/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java index a2c80f3d64..3cc17f5ce9 100644 --- a/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -22,7 +22,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.3.0-SNAPSHOT)", comments = "Source: io/grpc/testing/integration/test.proto") public final class TestServiceGrpc { diff --git a/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java index 00b76d4cd6..d71547a417 100644 --- a/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java +++ b/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java @@ -22,7 +22,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.3.0-SNAPSHOT)", comments = "Source: io/grpc/testing/integration/test.proto") public final class UnimplementedServiceGrpc {