Skip to content

Commit effdf58

Browse files
committed
Update Google SDK to version 1.23 (#27381)
This commit updates the google-api-client library to version 1.23.0. Related to #26636
1 parent 495a987 commit effdf58

23 files changed

+21
-16
lines changed

plugins/discovery-gce/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ esplugin {
66
}
77

88
versions << [
9-
'google': '1.20.0'
9+
'google': '1.23.0'
1010
]
1111

1212
dependencies {
13-
compile "com.google.apis:google-api-services-compute:v1-rev71-${versions.google}"
13+
compile "com.google.apis:google-api-services-compute:v1-rev160-${versions.google}"
1414
compile "com.google.api-client:google-api-client:${versions.google}"
1515
compile "com.google.oauth-client:google-oauth-client:${versions.google}"
1616
compile "com.google.http-client:google-http-client:${versions.google}"

plugins/discovery-gce/licenses/google-api-client-1.20.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
522ea860eb48dee71dfe2c61a1fd09663539f556
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
004169bfe1cf0e8b2013c9c479e43b731958bc64

plugins/discovery-gce/licenses/google-api-services-compute-v1-rev71-1.20.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

plugins/discovery-gce/licenses/google-http-client-1.20.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8e86c84ff3c98eca6423e97780325b299133d858

plugins/discovery-gce/licenses/google-http-client-jackson2-1.20.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fd6761f4046a8cb0455e6fa5f58e12b061e9826e

plugins/discovery-gce/licenses/google-oauth-client-1.20.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e57ea1e2220bda5a2bd24ff17860212861f3c5cf

plugins/repository-gcs/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ esplugin {
2323
}
2424

2525
versions << [
26-
'google': '1.21.0',
26+
'google': '1.23.0',
2727
]
2828

2929
dependencies {
30-
compile "com.google.apis:google-api-services-storage:v1-rev66-${versions.google}"
30+
compile "com.google.apis:google-api-services-storage:v1-rev115-${versions.google}"
3131
compile "com.google.api-client:google-api-client:${versions.google}"
3232
compile "com.google.oauth-client:google-oauth-client:${versions.google}"
3333
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"

plugins/repository-gcs/licenses/google-api-client-1.21.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
522ea860eb48dee71dfe2c61a1fd09663539f556
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ba4fb6c5dc8d5ad94dedd9927ceee10a31a59abd

plugins/repository-gcs/licenses/google-api-services-storage-v1-rev66-1.21.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

plugins/repository-gcs/licenses/google-http-client-1.21.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8e86c84ff3c98eca6423e97780325b299133d858

plugins/repository-gcs/licenses/google-http-client-jackson2-1.21.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fd6761f4046a8cb0455e6fa5f58e12b061e9826e

plugins/repository-gcs/licenses/google-oauth-client-1.21.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e57ea1e2220bda5a2bd24ff17860212861f3c5cf

plugins/repository-gcs/src/test/java/org/elasticsearch/repositories/gcs/MockHttpTransport.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ public MockHttpTransport(String bucket) {
271271
// content-id: 1
272272
// content-transfer-encoding: binary
273273
//
274-
// DELETE https://www.googleapis.com/storage/v1/b/ohifkgu/o/foo%2Ftest
274+
// DELETE https://www.googleapis.com/storage/v1/b/ohifkgu/o/foo%2Ftest HTTP/1.1
275275
//
276276
//
277277
// --__END_OF_PART__
@@ -280,7 +280,7 @@ public MockHttpTransport(String bucket) {
280280
// content-id: 2
281281
// content-transfer-encoding: binary
282282
//
283-
// DELETE https://www.googleapis.com/storage/v1/b/ohifkgu/o/bar%2Ftest
283+
// DELETE https://www.googleapis.com/storage/v1/b/ohifkgu/o/bar%2Ftest HTTP/1.1
284284
//
285285
//
286286
// --__END_OF_PART__--
@@ -291,6 +291,11 @@ public MockHttpTransport(String bucket) {
291291
req.getStreamingContent().writeTo(os);
292292

293293
Streams.readAllLines(new ByteArrayInputStream(os.toByteArray()), line -> {
294+
final int indexOfHttp = line.indexOf(" HTTP/1.1");
295+
if (indexOfHttp > 0) {
296+
line = line.substring(0, indexOfHttp);
297+
}
298+
294299
Handler handler = handlers.retrieve(line, params);
295300
if (handler != null) {
296301
try {

0 commit comments

Comments
 (0)