Start 1.2.0 development cycle

This commit is contained in:
Carl Mastrangelo 2017-01-30 16:40:12 -08:00 committed by GitHub
parent fdeade4ee2
commit e8aef5b4bb
23 changed files with 34 additions and 34 deletions

View File

@ -32,7 +32,7 @@ protobuf {
}
plugins {
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
artifact = 'io.grpc:protoc-gen-grpc-java:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
@ -61,10 +61,10 @@ dependencies {
compile 'com.google.guava:guava:18.0'
compile 'com.squareup.okhttp:okhttp:2.2.0'
// You need to build grpc-java to obtain these libraries below.
compile 'io.grpc:grpc-protobuf-nano:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-okhttp:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-testing:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
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 'javax.annotation:javax.annotation-api:1.2'
}

View File

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

View File

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

View File

@ -19,7 +19,7 @@ subprojects {
apply plugin: "com.google.osdetector"
group = "io.grpc"
version = "1.1.0-SNAPSHOT" // CURRENT_GRPC_VERSION
version = "1.2.0-SNAPSHOT" // CURRENT_GRPC_VERSION
sourceCompatibility = 1.6
targetCompatibility = 1.6

View File

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

View File

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

View File

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

View File

@ -21,7 +21,7 @@ need to make the following changes:
```diff
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -27,6 +27,7 @@ def grpcVersion = '1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
@@ -27,6 +27,7 @@ def grpcVersion = '1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
dependencies {
compile "io.grpc:grpc-netty:${grpcVersion}"
compile "io.grpc:grpc-protobuf:${grpcVersion}"

View File

@ -34,7 +34,7 @@ protobuf {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
}
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
artifact = 'io.grpc:protoc-gen-grpc-java:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
@ -57,8 +57,8 @@ dependencies {
compile 'com.squareup.okhttp:okhttp:2.2.0'
// You need to build grpc-java to obtain these libraries below.
compile 'io.grpc:grpc-okhttp:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-protobuf-lite:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
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 'javax.annotation:javax.annotation-api:1.2'
}

View File

@ -32,7 +32,7 @@ protobuf {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
}
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
artifact = 'io.grpc:protoc-gen-grpc-java:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
@ -55,8 +55,8 @@ dependencies {
compile 'com.squareup.okhttp:okhttp:2.2.0'
// You need to build grpc-java to obtain these libraries below.
compile 'io.grpc:grpc-okhttp:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-protobuf-lite:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
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 'javax.annotation:javax.annotation-api:1.2'
}

View File

@ -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.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
dependencies {
compile "io.grpc:grpc-netty:${grpcVersion}"

View File

@ -6,11 +6,11 @@
<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.1.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<version>1.2.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<name>examples</name>
<url>http://maven.apache.org</url>
<properties>
<grpc.version>1.1.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<grpc.version>1.2.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
</properties>
<dependencies>
<dependency>

View File

@ -4,7 +4,7 @@ description = "Thrift Examples"
startScripts.enabled = false
def grpcVersion = '1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
repositories {
mavenCentral()

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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