[
https://issues.apache.org/jira/browse/BEAM-3991?focusedWorklogId=93336&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-93336
]
ASF GitHub Bot logged work on BEAM-3991:
----------------------------------------
Author: ASF GitHub Bot
Created on: 20/Apr/18 18:15
Start Date: 20/Apr/18 18:15
Worklog Time Spent: 10m
Work Description: kennknowles closed pull request #5046: [BEAM-3991]
Updating Google API client dependencies to 1.23 versions
URL: https://github.com/apache/beam/pull/5046
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/build_rules.gradle b/build_rules.gradle
index ada4c8b5976..a00643df153 100644
--- a/build_rules.gradle
+++ b/build_rules.gradle
@@ -162,7 +162,7 @@ offlineDependencies {
def google_cloud_bigdataoss_version = "1.4.5"
def bigtable_version = "1.0.0"
def bigtable_proto_version = "1.0.0-pre3"
-def google_clients_version = "1.22.0"
+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"
@@ -218,11 +218,11 @@ ext.library = [
google_api_client_java6:
"com.google.api-client:google-api-client-java6:$google_clients_version",
google_api_common: "com.google.api:api-common:1.0.0-rc2",
google_api_services_bigquery:
"com.google.apis:google-api-services-bigquery:v2-rev374-$google_clients_version",
- google_api_services_clouddebugger:
"com.google.apis:google-api-services-clouddebugger:v2-rev8-$google_clients_version",
- google_api_services_cloudresourcemanager:
"com.google.apis:google-api-services-cloudresourcemanager:v1-rev6-$google_clients_version",
+ google_api_services_clouddebugger:
"com.google.apis:google-api-services-clouddebugger:v2-rev233-$google_clients_version",
+ google_api_services_cloudresourcemanager:
"com.google.apis:google-api-services-cloudresourcemanager:v1-rev477-$google_clients_version",
google_api_services_dataflow:
"com.google.apis:google-api-services-dataflow:v1b3-rev221-$google_clients_version",
- google_api_services_pubsub:
"com.google.apis:google-api-services-pubsub:v1-rev10-$google_clients_version",
- google_api_services_storage:
"com.google.apis:google-api-services-storage:v1-rev71-$google_clients_version",
+ google_api_services_pubsub:
"com.google.apis:google-api-services-pubsub:v1-rev382-$google_clients_version",
+ google_api_services_storage:
"com.google.apis:google-api-services-storage:v1-rev124-$google_clients_version",
google_auth_library_credentials:
"com.google.auth:google-auth-library-credentials:$google_auth_version",
google_auth_library_oauth2_http:
"com.google.auth:google-auth-library-oauth2-http:$google_auth_version",
google_cloud_core: "com.google.cloud:google-cloud-core:1.0.2",
diff --git a/pom.xml b/pom.xml
index e14a190f2e7..3e42a31f53f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,13 +108,13 @@
<api-common.version>1.0.0-rc2</api-common.version>
<args4j.version>2.33</args4j.version>
<avro.version>1.8.2</avro.version>
- <bigquery.version>v2-rev374-1.22.0</bigquery.version>
+ <bigquery.version>v2-rev374-1.23.0</bigquery.version>
<bigtable.version>1.0.0</bigtable.version>
<bigtable.proto.version>1.0.0-pre3</bigtable.proto.version>
- <cloudresourcemanager.version>v1-rev6-1.22.0</cloudresourcemanager.version>
+
<cloudresourcemanager.version>v1-rev477-1.23.0</cloudresourcemanager.version>
<pubsubgrpc.version>0.1.18</pubsubgrpc.version>
- <clouddebugger.version>v2-rev8-1.22.0</clouddebugger.version>
- <dataflow.version>v1b3-rev221-1.22.0</dataflow.version>
+ <clouddebugger.version>v2-rev233-1.23.0</clouddebugger.version>
+ <dataflow.version>v1b3-rev221-1.23.0</dataflow.version>
<dataflow.proto.version>0.5.160222</dataflow.proto.version>
<datastore.client.version>1.4.0</datastore.client.version>
<datastore.proto.version>1.3.0</datastore.proto.version>
@@ -122,7 +122,7 @@
<google-auto-service.version>1.0-rc2</google-auto-service.version>
<google-auto-value.version>1.5.3</google-auto-value.version>
<google-auth.version>0.7.1</google-auth.version>
- <google-clients.version>1.22.0</google-clients.version>
+ <google-clients.version>1.23.0</google-clients.version>
<google-cloud-bigdataoss.version>1.4.5</google-cloud-bigdataoss.version>
<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>
@@ -145,13 +145,13 @@
<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>
- <pubsub.version>v1-rev10-1.22.0</pubsub.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>
<spark.version>2.3.0</spark.version>
<spring.version>4.3.5.RELEASE</spring.version>
<stax2.version>3.1.4</stax2.version>
- <storage.version>v1-rev71-1.22.0</storage.version>
+ <storage.version>v1-rev124-1.23.0</storage.version>
<woodstox.version>4.4.1</woodstox.version>
<spring.version>4.3.5.RELEASE</spring.version>
<snappy-java.version>1.1.4</snappy-java.version>
diff --git
a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
index f7eca249952..dc8ddb77163 100644
---
a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
+++
b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
@@ -29,7 +29,7 @@
import com.fasterxml.jackson.databind.Module;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.api.client.googleapis.json.GoogleJsonResponseException;
-import com.google.api.services.clouddebugger.v2.Clouddebugger;
+import com.google.api.services.clouddebugger.v2.CloudDebugger;
import com.google.api.services.clouddebugger.v2.model.Debuggee;
import com.google.api.services.clouddebugger.v2.model.RegisterDebuggeeRequest;
import com.google.api.services.clouddebugger.v2.model.RegisterDebuggeeResponse;
@@ -617,14 +617,14 @@ private void
maybeRegisterDebuggee(DataflowPipelineOptions options, String uniqu
throw new RuntimeException("Should not specify the debuggee");
}
- Clouddebugger debuggerClient =
DataflowTransport.newClouddebuggerClient(options).build();
+ CloudDebugger debuggerClient =
DataflowTransport.newClouddebuggerClient(options).build();
Debuggee debuggee = registerDebuggee(debuggerClient, uniquifier);
options.setDebuggee(debuggee);
System.out.println(debuggerMessage(options.getProject(),
debuggee.getUniquifier()));
}
- private Debuggee registerDebuggee(Clouddebugger debuggerClient, String
uniquifier) {
+ private Debuggee registerDebuggee(CloudDebugger debuggerClient, String
uniquifier) {
RegisterDebuggeeRequest registerReq = new RegisterDebuggeeRequest();
registerReq.setDebuggee(new Debuggee()
.setProject(options.getProject())
diff --git
a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/DataflowTransport.java
b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/DataflowTransport.java
index b28b8d36fc2..29a8eb87089 100644
---
a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/DataflowTransport.java
+++
b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/DataflowTransport.java
@@ -21,7 +21,7 @@
import static org.apache.beam.sdk.util.Transport.getTransport;
import com.google.api.client.http.HttpRequestInitializer;
-import com.google.api.services.clouddebugger.v2.Clouddebugger;
+import com.google.api.services.clouddebugger.v2.CloudDebugger;
import com.google.api.services.dataflow.Dataflow;
import com.google.auth.Credentials;
import com.google.auth.http.HttpCredentialsAdapter;
@@ -84,8 +84,8 @@ private static ApiComponents apiComponentsFromUrl(String
urlString) {
.setGoogleClientRequestInitializer(options.getGoogleApiTrace());
}
- public static Clouddebugger.Builder
newClouddebuggerClient(DataflowPipelineOptions options) {
- return new Clouddebugger.Builder(getTransport(),
+ public static CloudDebugger.Builder
newClouddebuggerClient(DataflowPipelineOptions options) {
+ return new CloudDebugger.Builder(getTransport(),
getJsonFactory(),
chainHttpRequestInitializer(options.getGcpCredential(), new
RetryHttpRequestInitializer()))
.setApplicationName(options.getAppName())
----------------------------------------------------------------
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: 93336)
Time Spent: 1h 20m (was: 1h 10m)
> Update dependency 'google-api-services-storage' to latest version
> -----------------------------------------------------------------
>
> Key: BEAM-3991
> URL: https://issues.apache.org/jira/browse/BEAM-3991
> Project: Beam
> Issue Type: Improvement
> Components: io-java-gcp, sdk-py-core
> Reporter: Chamikara Jayalath
> Assignee: Chamikara Jayalath
> Priority: Blocker
> Fix For: 2.5.0
>
> Time Spent: 1h 20m
> Remaining Estimate: 0h
>
> Currently we use version 'v1-rev71-1.22.0' which is deprecated and about two
> years old.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
