grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Start 1.7.0 development cycle (#3357) 

This bump changelist is applied a bit late with respect to the
1.6.0 branch cut. Look at the 1.6.0 to see the source of truth of
where it was cut. Do not assume it is the commit that precedes
this one.
This commit is contained in:
zpencer 2017-08-22 12:29:03 -07:00 committed by GitHub
parent e707d95d77
commit ab85c5ae76
25 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
android-interop-testing/app/build.gradle
View File

@ -33,7 +33,7 @@ protobuf {
} }
plugins { plugins {
grpc { grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION artifact = 'io.grpc:protoc-gen-grpc-java:1.7.0-SNAPSHOT' // CURRENT_GRPC_VERSION
} }
} }
generateProtoTasks { generateProtoTasks {
@ -60,10 +60,10 @@ dependencies {
compile 'com.android.support:support-annotations:23.1.1' compile 'com.android.support:support-annotations:23.1.1'
compile 'com.google.android.gms:play-services-base:7.3.0' compile 'com.google.android.gms:play-services-base:7.3.0'
// You need to build grpc-java to obtain the grpc libraries below. // You need to build grpc-java to obtain the grpc libraries below.
compile 'io.grpc:grpc-protobuf-nano:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'io.grpc:grpc-protobuf-nano:1.7.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-okhttp:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'io.grpc:grpc-okhttp:1.7.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'io.grpc:grpc-stub:1.7.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-testing:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'io.grpc:grpc-testing:1.7.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'javax.annotation:javax.annotation-api:1.2' compile 'javax.annotation:javax.annotation-api:1.2'
compile 'junit:junit:4.12' compile 'junit:junit:4.12'

2
benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java
View File

@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
/** /**
*/ */
@javax.annotation.Generated( @javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
comments = "Source: services.proto") comments = "Source: services.proto")
public final class BenchmarkServiceGrpc { public final class BenchmarkServiceGrpc {

2
benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java
View File

@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
/** /**
*/ */
@javax.annotation.Generated( @javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
comments = "Source: services.proto") comments = "Source: services.proto")
public final class ReportQpsScenarioServiceGrpc { public final class ReportQpsScenarioServiceGrpc {

2
benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java
View File

@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
/** /**
*/ */
@javax.annotation.Generated( @javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
comments = "Source: services.proto") comments = "Source: services.proto")
public final class WorkerServiceGrpc { public final class WorkerServiceGrpc {

2
build.gradle
View File

@ -47,7 +47,7 @@ subprojects {
idea.module.inheritOutputDirs = true idea.module.inheritOutputDirs = true
group = "io.grpc" group = "io.grpc"
version = "1.6.0-SNAPSHOT" // CURRENT_GRPC_VERSION version = "1.7.0-SNAPSHOT" // CURRENT_GRPC_VERSION
sourceCompatibility = 1.6 sourceCompatibility = 1.6
targetCompatibility = 1.6 targetCompatibility = 1.6

2
compiler/src/test/golden/TestService.java.txt
View File

@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
* </pre> * </pre>
*/ */
@javax.annotation.Generated( @javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
comments = "Source: test.proto") comments = "Source: test.proto")
public final class TestServiceGrpc { public final class TestServiceGrpc {

2
compiler/src/testLite/golden/TestService.java.txt
View File

@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
* </pre> * </pre>
*/ */
@javax.annotation.Generated( @javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
comments = "Source: test.proto") comments = "Source: test.proto")
public final class TestServiceGrpc { public final class TestServiceGrpc {

2
compiler/src/testNano/golden/TestService.java.txt
View File

@ -23,7 +23,7 @@ import java.io.IOException;
* </pre> * </pre>
*/ */
@javax.annotation.Generated( @javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
comments = "Source: test.proto") comments = "Source: test.proto")
public final class TestServiceGrpc { public final class TestServiceGrpc {

8
examples/android/helloworld/app/build.gradle
View File

@ -34,7 +34,7 @@ protobuf {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
} }
grpc { grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION artifact = 'io.grpc:protoc-gen-grpc-java:1.7.0-SNAPSHOT' // CURRENT_GRPC_VERSION
} }
} }
generateProtoTasks { generateProtoTasks {
@ -54,8 +54,8 @@ dependencies {
compile 'com.android.support:appcompat-v7:22.1.1' compile 'com.android.support:appcompat-v7:22.1.1'
// You need to build grpc-java to obtain these libraries below. // You need to build grpc-java to obtain these libraries below.
compile 'io.grpc:grpc-okhttp:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'io.grpc:grpc-okhttp:1.7.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-protobuf-lite:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'io.grpc:grpc-protobuf-lite:1.7.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'io.grpc:grpc-stub:1.7.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'javax.annotation:javax.annotation-api:1.2' compile 'javax.annotation:javax.annotation-api:1.2'
} }

8
examples/android/routeguide/app/build.gradle
View File

@ -32,7 +32,7 @@ protobuf {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
} }
grpc { grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION artifact = 'io.grpc:protoc-gen-grpc-java:1.7.0-SNAPSHOT' // CURRENT_GRPC_VERSION
} }
} }
generateProtoTasks { generateProtoTasks {
@ -52,8 +52,8 @@ dependencies {
compile 'com.android.support:appcompat-v7:23.+' compile 'com.android.support:appcompat-v7:23.+'
// You need to build grpc-java to obtain these libraries below. // You need to build grpc-java to obtain these libraries below.
compile 'io.grpc:grpc-okhttp:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'io.grpc:grpc-okhttp:1.7.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-protobuf-lite:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'io.grpc:grpc-protobuf-lite:1.7.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'io.grpc:grpc-stub:1.7.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'javax.annotation:javax.annotation-api:1.2' compile 'javax.annotation:javax.annotation-api:1.2'
} }

2
examples/build.gradle
View File

@ -22,7 +22,7 @@ repositories {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.7.0-SNAPSHOT' // CURRENT_GRPC_VERSION
dependencies { dependencies {
compile "com.google.api.grpc:proto-google-common-protos:0.1.9" compile "com.google.api.grpc:proto-google-common-protos:0.1.9"

4
examples/pom.xml
View File

@ -6,11 +6,11 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<!-- Feel free to delete the comment at the end of these lines. It is just <!-- Feel free to delete the comment at the end of these lines. It is just
for safely updating the version in our release process. --> for safely updating the version in our release process. -->
<version>1.6.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <version>1.7.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<name>examples</name> <name>examples</name>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
<properties> <properties>
<grpc.version>1.6.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.7.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>

2
examples/thrift/build.gradle
View File

@ -12,7 +12,7 @@ repositories {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.7.0-SNAPSHOT' // CURRENT_GRPC_VERSION
dependencies { dependencies {
compile "io.grpc:grpc-stub:${grpcVersion}" compile "io.grpc:grpc-stub:${grpcVersion}"

2
grpclb/src/generated/main/grpc/io/grpc/grpclb/LoadBalancerGrpc.java
View File

@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
/** /**
*/ */
@javax.annotation.Generated( @javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
comments = "Source: load_balancer.proto") comments = "Source: load_balancer.proto")
public final class LoadBalancerGrpc { public final class LoadBalancerGrpc {

2
interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
View File

@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
/** /**
*/ */
@javax.annotation.Generated( @javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
comments = "Source: io/grpc/testing/integration/metrics.proto") comments = "Source: io/grpc/testing/integration/metrics.proto")
public final class MetricsServiceGrpc { public final class MetricsServiceGrpc {

2
interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
View File

@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
* </pre> * </pre>
*/ */
@javax.annotation.Generated( @javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
comments = "Source: io/grpc/testing/integration/test.proto") comments = "Source: io/grpc/testing/integration/test.proto")
public final class ReconnectServiceGrpc { public final class ReconnectServiceGrpc {

2
interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
View File

@ -22,7 +22,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
* </pre> * </pre>
*/ */
@javax.annotation.Generated( @javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
comments = "Source: io/grpc/testing/integration/test.proto") comments = "Source: io/grpc/testing/integration/test.proto")
public final class TestServiceGrpc { public final class TestServiceGrpc {

2
interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
View File

@ -22,7 +22,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
* </pre> * </pre>
*/ */
@javax.annotation.Generated( @javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
comments = "Source: io/grpc/testing/integration/test.proto") comments = "Source: io/grpc/testing/integration/test.proto")
public final class UnimplementedServiceGrpc { public final class UnimplementedServiceGrpc {

2
services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java
View File

@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
/** /**
*/ */
@javax.annotation.Generated( @javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
comments = "Source: health.proto") comments = "Source: health.proto")
public final class HealthGrpc { public final class HealthGrpc {

2
services/src/generated/main/grpc/io/grpc/instrumentation/v1alpha/MonitoringGrpc.java
View File

@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
/** /**
*/ */
@javax.annotation.Generated( @javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
comments = "Source: grpc/instrumentation/v1alpha/monitoring.proto") comments = "Source: grpc/instrumentation/v1alpha/monitoring.proto")
public final class MonitoringGrpc { public final class MonitoringGrpc {

2
services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java
View File

@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
/** /**
*/ */
@javax.annotation.Generated( @javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
comments = "Source: io/grpc/reflection/v1alpha/reflection.proto") comments = "Source: io/grpc/reflection/v1alpha/reflection.proto")
public final class ServerReflectionGrpc { public final class ServerReflectionGrpc {

2
services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java
View File

@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
* </pre> * </pre>
*/ */
@javax.annotation.Generated( @javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
comments = "Source: io/grpc/reflection/testing/dynamic_reflection_test.proto") comments = "Source: io/grpc/reflection/testing/dynamic_reflection_test.proto")
public final class AnotherDynamicServiceGrpc { public final class AnotherDynamicServiceGrpc {

2
services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java
View File

@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
* </pre> * </pre>
*/ */
@javax.annotation.Generated( @javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
comments = "Source: io/grpc/reflection/testing/dynamic_reflection_test.proto") comments = "Source: io/grpc/reflection/testing/dynamic_reflection_test.proto")
public final class DynamicServiceGrpc { public final class DynamicServiceGrpc {

2
services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java
View File

@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
/** /**
*/ */
@javax.annotation.Generated( @javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
comments = "Source: io/grpc/reflection/testing/reflection_test.proto") comments = "Source: io/grpc/reflection/testing/reflection_test.proto")
public final class ReflectableServiceGrpc { public final class ReflectableServiceGrpc {

2
testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java
View File

@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
* </pre> * </pre>
*/ */
@javax.annotation.Generated( @javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
comments = "Source: io/grpc/testing/protobuf/simpleservice.proto") comments = "Source: io/grpc/testing/protobuf/simpleservice.proto")
public final class SimpleServiceGrpc { public final class SimpleServiceGrpc {