Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1.5.0 Point Release #3249

Merged
merged 3 commits into from Jul 17, 2017
Merged

1.5.0 Point Release #3249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
202675e
all: update readme to point at 1.5.0
carl-mastrangelo Jul 17, 2017
1e534e5
all: create 1.5.0 point release
carl-mastrangelo Jul 17, 2017
996695c
all: begin 1.5.1 cycle
carl-mastrangelo Jul 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 12 additions & 12 deletions README.md
View file
Open in desktop
Expand Up @@ -28,37 +28,37 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`:
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</dependency>
```

Or for Gradle with non-Android, add to your dependencies:
```gradle
compile 'io.grpc:grpc-netty:1.4.0'
compile 'io.grpc:grpc-protobuf:1.4.0'
compile 'io.grpc:grpc-stub:1.4.0'
compile 'io.grpc:grpc-netty:1.5.0'
compile 'io.grpc:grpc-protobuf:1.5.0'
compile 'io.grpc:grpc-stub:1.5.0'
```

For Android client, use `grpc-okhttp` instead of `grpc-netty` and
`grpc-protobuf-lite` or `grpc-protobuf-nano` instead of `grpc-protobuf`:
```gradle
compile 'io.grpc:grpc-okhttp:1.4.0'
compile 'io.grpc:grpc-protobuf-lite:1.4.0'
compile 'io.grpc:grpc-stub:1.4.0'
compile 'io.grpc:grpc-okhttp:1.5.0'
compile 'io.grpc:grpc-protobuf-lite:1.5.0'
compile 'io.grpc:grpc-stub:1.5.0'
```

[the JARs]:
http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.grpc%22%20AND%20v%3A%221.4.0%22
http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.grpc%22%20AND%20v%3A%221.5.0%22

Development snapshots are available in [Sonatypes's snapshot
repository](https://oss.sonatype.org/content/repositories/snapshots/).
Expand Down Expand Up @@ -87,7 +87,7 @@ For protobuf-based codegen integrated with the Maven build system, you can use
<configuration>
<protocArtifact>com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.4.0:exe:${os.detected.classifier}</pluginArtifact>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.5.0:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -127,7 +127,7 @@ protobuf {
}
plugins {
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.4.0'
artifact = 'io.grpc:protoc-gen-grpc-java:1.5.0'
}
}
generateProtoTasks {
Expand Down
10 changes: 5 additions & 5 deletions android-interop-testing/app/build.gradle
View file
Open in desktop
Expand Up @@ -33,7 +33,7 @@ protobuf {
}
plugins {
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION
artifact = 'io.grpc:protoc-gen-grpc-java:1.5.1-SNAPSHOT' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
Expand All @@ -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.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-okhttp:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-testing:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-protobuf-nano:1.5.1-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-okhttp:1.5.1-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.5.1-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-testing:1.5.1-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'javax.annotation:javax.annotation-api:1.2'
compile 'junit:junit:4.12'

Expand Down
2 changes: 1 addition & 1 deletion benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
/**
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.5.1-SNAPSHOT)",
comments = "Source: services.proto")
public final class BenchmarkServiceGrpc {

Expand Down
2 changes: 1 addition & 1 deletion ...hmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
/**
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.5.1-SNAPSHOT)",
comments = "Source: services.proto")
public final class ReportQpsScenarioServiceGrpc {

Expand Down
2 changes: 1 addition & 1 deletion benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
/**
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.5.1-SNAPSHOT)",
comments = "Source: services.proto")
public final class WorkerServiceGrpc {

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@ subprojects {
}

group = "io.grpc"
version = "1.5.0-SNAPSHOT" // CURRENT_GRPC_VERSION
version = "1.5.1-SNAPSHOT" // CURRENT_GRPC_VERSION

sourceCompatibility = 1.6
targetCompatibility = 1.6
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/test/golden/TestService.java.txt
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
* </pre>
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.5.1-SNAPSHOT)",
comments = "Source: test.proto")
public final class TestServiceGrpc {

Expand Down
2 changes: 1 addition & 1 deletion compiler/src/testLite/golden/TestService.java.txt
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
* </pre>
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.5.1-SNAPSHOT)",
comments = "Source: test.proto")
public final class TestServiceGrpc {

Expand Down
2 changes: 1 addition & 1 deletion compiler/src/testNano/golden/TestService.java.txt
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@ import java.io.IOException;
* </pre>
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.5.1-SNAPSHOT)",
comments = "Source: test.proto")
public final class TestServiceGrpc {

Expand Down
8 changes: 4 additions & 4 deletions examples/android/helloworld/app/build.gradle
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@ protobuf {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
}
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION
artifact = 'io.grpc:protoc-gen-grpc-java:1.5.1-SNAPSHOT' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
Expand All @@ -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.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-protobuf-lite:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-okhttp:1.5.1-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-protobuf-lite:1.5.1-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.5.1-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'javax.annotation:javax.annotation-api:1.2'
}
8 changes: 4 additions & 4 deletions examples/android/routeguide/app/build.gradle
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ protobuf {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
}
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION
artifact = 'io.grpc:protoc-gen-grpc-java:1.5.1-SNAPSHOT' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
Expand All @@ -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.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-protobuf-lite:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-okhttp:1.5.1-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-protobuf-lite:1.5.1-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.5.1-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'javax.annotation:javax.annotation-api:1.2'
}
2 changes: 1 addition & 1 deletion examples/build.gradle
View file
Open in desktop
Expand Up @@ -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.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.5.1-SNAPSHOT' // CURRENT_GRPC_VERSION

dependencies {
compile "com.google.api.grpc:proto-google-common-protos:0.1.9"
Expand Down
4 changes: 2 additions & 2 deletions examples/pom.xml
View file
Open in desktop
Expand Up @@ -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.5.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<version>1.5.1-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<name>examples</name>
<url>http://maven.apache.org</url>
<properties>
<grpc.version>1.5.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<grpc.version>1.5.1-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
</properties>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion examples/thrift/build.gradle
View file
Open in desktop
Expand Up @@ -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.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.5.1-SNAPSHOT' // CURRENT_GRPC_VERSION

dependencies {
compile "io.grpc:grpc-stub:${grpcVersion}"
Expand Down
2 changes: 1 addition & 1 deletion grpclb/src/generated/main/grpc/io/grpc/grpclb/LoadBalancerGrpc.java
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
/**
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.5.1-SNAPSHOT)",
comments = "Source: load_balancer.proto")
public final class LoadBalancerGrpc {

Expand Down
2 changes: 1 addition & 1 deletion services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
/**
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.5.1-SNAPSHOT)",
comments = "Source: health.proto")
public final class HealthGrpc {

Expand Down
2 changes: 1 addition & 1 deletion services/src/generated/main/grpc/io/grpc/instrumentation/v1alpha/MonitoringGrpc.java
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
/**
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.5.1-SNAPSHOT)",
comments = "Source: grpc/instrumentation/v1alpha/monitoring.proto")
public final class MonitoringGrpc {

Expand Down
2 changes: 1 addition & 1 deletion services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
/**
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.5.1-SNAPSHOT)",
comments = "Source: io/grpc/reflection/v1alpha/reflection.proto")
public final class ServerReflectionGrpc {

Expand Down
2 changes: 1 addition & 1 deletion services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@
* </pre>
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.5.1-SNAPSHOT)",
comments = "Source: io/grpc/reflection/testing/dynamic_reflection_test.proto")
public final class AnotherDynamicServiceGrpc {

Expand Down
2 changes: 1 addition & 1 deletion services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@
* </pre>
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.5.1-SNAPSHOT)",
comments = "Source: io/grpc/reflection/testing/dynamic_reflection_test.proto")
public final class DynamicServiceGrpc {

Expand Down
2 changes: 1 addition & 1 deletion services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
/**
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.5.1-SNAPSHOT)",
comments = "Source: io/grpc/reflection/testing/reflection_test.proto")
public final class ReflectableServiceGrpc {

Expand Down
2 changes: 1 addition & 1 deletion testing-proto/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
/**
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.5.1-SNAPSHOT)",
comments = "Source: io/grpc/testing/integration/metrics.proto")
public final class MetricsServiceGrpc {

Expand Down
2 changes: 1 addition & 1 deletion testing-proto/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@
* </pre>
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.5.1-SNAPSHOT)",
comments = "Source: io/grpc/testing/integration/test.proto")
public final class ReconnectServiceGrpc {

Expand Down
2 changes: 1 addition & 1 deletion testing-proto/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
* </pre>
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.5.1-SNAPSHOT)",
comments = "Source: io/grpc/testing/integration/test.proto")
public final class TestServiceGrpc {

Expand Down
2 changes: 1 addition & 1 deletion ...g-proto/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
* </pre>
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.5.1-SNAPSHOT)",
comments = "Source: io/grpc/testing/integration/test.proto")
public final class UnimplementedServiceGrpc {

Expand Down