[
https://issues.apache.org/jira/browse/BEAM-3098?focusedWorklogId=128358&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-128358
]
ASF GitHub Bot logged work on BEAM-3098:
----------------------------------------
Author: ASF GitHub Bot
Created on: 27/Jul/18 23:48
Start Date: 27/Jul/18 23:48
Worklog Time Spent: 10m
Work Description: chamikaramj closed pull request #5767: [BEAM-3098]
Upgrades gRPC and protobuf dependencies
URL: https://github.com/apache/beam/pull/5767
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 807d00e8e1c..4c41ec710c9 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -307,10 +307,10 @@ class BeamModulePlugin implements Plugin<Project> {
def bigtable_proto_version = "1.0.0-pre3"
def google_clients_version = "1.23.0"
def google_auth_version = "0.7.1"
- def grpc_version = "1.2.0"
- def protobuf_version = "3.2.0"
+ def grpc_version = "1.12.0"
+ def protobuf_version = "3.5.1"
def guava_version = "20.0"
- def netty_version = "4.1.8.Final"
+ def netty_version = "4.1.22.Final"
def grpc_google_common_protos = "0.1.9"
def hamcrest_version = "1.3"
def hadoop_version = "2.7.3"
@@ -371,7 +371,7 @@ class BeamModulePlugin implements Plugin<Project> {
google_cloud_core :
"com.google.cloud:google-cloud-core:1.0.2",
google_cloud_core_grpc :
"com.google.cloud:google-cloud-core-grpc:$grpc_version",
google_cloud_dataflow_java_proto_library_all:
"com.google.cloud.dataflow:google-cloud-dataflow-java-proto-library-all:0.5.160304",
- google_cloud_spanner :
"com.google.cloud:google-cloud-spanner:0.20.0b-beta",
+ google_cloud_spanner :
"com.google.cloud:google-cloud-spanner:0.53.0-beta",
google_http_client :
"com.google.http-client:google-http-client:$google_clients_version",
google_http_client_jackson :
"com.google.http-client:google-http-client-jackson:$google_clients_version",
google_http_client_jackson2 :
"com.google.http-client:google-http-client-jackson2:$google_clients_version",
@@ -411,7 +411,7 @@ class BeamModulePlugin implements Plugin<Project> {
malhar_library :
"org.apache.apex:malhar-library:$apex_malhar_version",
mockito_core :
"org.mockito:mockito-core:1.9.5",
netty_handler :
"io.netty:netty-handler:$netty_version",
- netty_tcnative_boringssl_static :
"io.netty:netty-tcnative-boringssl-static:1.1.33.Fork26",
+ netty_tcnative_boringssl_static :
"io.netty:netty-tcnative-boringssl-static:2.0.7.Final",
netty_transport_native_epoll :
"io.netty:netty-transport-native-epoll:$netty_version",
postgres :
"org.postgresql:postgresql:$postgres_version",
protobuf_java :
"com.google.protobuf:protobuf-java:$protobuf_version",
diff --git a/pom.xml b/pom.xml
index 93b230ffb10..6b4d7b5c7a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@
<google-cloud-core.version>1.0.2</google-cloud-core.version>
<google-cloud-dataflow-java-proto-library-all.version>0.5.160304</google-cloud-dataflow-java-proto-library-all.version>
<guava.version>20.0</guava.version>
- <grpc.version>1.2.0</grpc.version>
+ <grpc.version>1.12.0</grpc.version>
<grpc-google-common-protos.version>0.1.9</grpc-google-common-protos.version>
<!--
This is the version of Hadoop used to compile the module that depend on
Hadoop.
@@ -142,12 +142,12 @@
<joda.version>2.4</joda.version>
<junit.version>4.12</junit.version>
<mockito.version>1.9.5</mockito.version>
- <netty.version>4.1.8.Final</netty.version>
- <netty.tcnative.version>1.1.33.Fork26</netty.tcnative.version>
- <protobuf.version>3.2.0</protobuf.version>
+ <netty.version>4.1.22.Final</netty.version>
+ <netty.tcnative.version>2.0.7.Final</netty.tcnative.version>
+ <protobuf.version>3.5.1</protobuf.version>
<pubsub.version>v1-rev382-1.23.0</pubsub.version>
<slf4j.version>1.7.25</slf4j.version>
- <spanner.version>0.20.0b-beta</spanner.version>
+ <spanner.version>0.53.0-beta</spanner.version>
<spark.version>2.3.1</spark.version>
<spring.version>4.3.5.RELEASE</spring.version>
<stax2.version>3.1.4</stax2.version>
diff --git
a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/ArtifactServiceStagerTest.java
b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/ArtifactServiceStagerTest.java
index bcbff948cc8..4d22f1dc85c 100644
---
a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/ArtifactServiceStagerTest.java
+++
b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/ArtifactServiceStagerTest.java
@@ -26,9 +26,9 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.io.BaseEncoding;
+import io.grpc.Server;
import io.grpc.inprocess.InProcessChannelBuilder;
import io.grpc.inprocess.InProcessServerBuilder;
-import io.grpc.internal.ServerImpl;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -57,7 +57,7 @@
public class ArtifactServiceStagerTest {
@Rule public TemporaryFolder temp = new TemporaryFolder();
- private ServerImpl server;
+ private Server server;
private InMemoryArtifactStagerService service;
private ArtifactServiceStager stager;
diff --git
a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/portable/artifact/LocalFileSystemArtifactStagerServiceTest.java
b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/portable/artifact/LocalFileSystemArtifactStagerServiceTest.java
index e43481e51f9..bab0b44337b 100644
---
a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/portable/artifact/LocalFileSystemArtifactStagerServiceTest.java
+++
b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/portable/artifact/LocalFileSystemArtifactStagerServiceTest.java
@@ -24,9 +24,9 @@
import com.google.common.util.concurrent.Uninterruptibles;
import com.google.protobuf.ByteString;
+import io.grpc.Server;
import io.grpc.inprocess.InProcessChannelBuilder;
import io.grpc.inprocess.InProcessServerBuilder;
-import io.grpc.internal.ServerImpl;
import io.grpc.stub.StreamObserver;
import java.io.File;
import java.io.FileInputStream;
@@ -55,7 +55,7 @@
private ArtifactStagingServiceGrpc.ArtifactStagingServiceStub stub;
private LocalFileSystemArtifactStagerService stager;
- private ServerImpl server;
+ private Server server;
@Before
public void setup() throws Exception {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 128358)
Time Spent: 1.5h (was: 1h 20m)
> Upgrade Java grpc version
> -------------------------
>
> Key: BEAM-3098
> URL: https://issues.apache.org/jira/browse/BEAM-3098
> Project: Beam
> Issue Type: Improvement
> Components: sdk-java-core
> Reporter: Solomon Duskis
> Assignee: Garrett Jones
> Priority: Major
> Fix For: 2.7.0
>
> Time Spent: 1.5h
> Remaining Estimate: 0h
>
> Beam Java currently depends on grpc 1.2, which was released in March. It
> would be great if the dependency could be update to something newer, like
> grpc 1.7.0
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
