Răsfoiți Sursa

Update Google SDK to version 1.23 (#27381)

This commit updates the google-api-client library to version 1.23.0.

Related to #26636
Tanguy Leroux 8 ani în urmă
părinte
comite
50a2459adf
23 a modificat fișierele cu 21 adăugiri și 16 ștergeri
  1. 2 2
      plugins/discovery-gce/build.gradle
  2. 0 1
      plugins/discovery-gce/licenses/google-api-client-1.20.0.jar.sha1
  3. 1 0
      plugins/discovery-gce/licenses/google-api-client-1.23.0.jar.sha1
  4. 1 0
      plugins/discovery-gce/licenses/google-api-services-compute-v1-rev160-1.23.0.jar.sha1
  5. 0 1
      plugins/discovery-gce/licenses/google-api-services-compute-v1-rev71-1.20.0.jar.sha1
  6. 0 1
      plugins/discovery-gce/licenses/google-http-client-1.20.0.jar.sha1
  7. 1 0
      plugins/discovery-gce/licenses/google-http-client-1.23.0.jar.sha1
  8. 0 1
      plugins/discovery-gce/licenses/google-http-client-jackson2-1.20.0.jar.sha1
  9. 1 0
      plugins/discovery-gce/licenses/google-http-client-jackson2-1.23.0.jar.sha1
  10. 0 1
      plugins/discovery-gce/licenses/google-oauth-client-1.20.0.jar.sha1
  11. 1 0
      plugins/discovery-gce/licenses/google-oauth-client-1.23.0.jar.sha1
  12. 2 2
      plugins/repository-gcs/build.gradle
  13. 0 1
      plugins/repository-gcs/licenses/google-api-client-1.21.0.jar.sha1
  14. 1 0
      plugins/repository-gcs/licenses/google-api-client-1.23.0.jar.sha1
  15. 1 0
      plugins/repository-gcs/licenses/google-api-services-storage-v1-rev115-1.23.0.jar.sha1
  16. 0 1
      plugins/repository-gcs/licenses/google-api-services-storage-v1-rev66-1.21.0.jar.sha1
  17. 0 1
      plugins/repository-gcs/licenses/google-http-client-1.21.0.jar.sha1
  18. 1 0
      plugins/repository-gcs/licenses/google-http-client-1.23.0.jar.sha1
  19. 0 1
      plugins/repository-gcs/licenses/google-http-client-jackson2-1.21.0.jar.sha1
  20. 1 0
      plugins/repository-gcs/licenses/google-http-client-jackson2-1.23.0.jar.sha1
  21. 0 1
      plugins/repository-gcs/licenses/google-oauth-client-1.21.0.jar.sha1
  22. 1 0
      plugins/repository-gcs/licenses/google-oauth-client-1.23.0.jar.sha1
  23. 7 2
      plugins/repository-gcs/src/test/java/org/elasticsearch/repositories/gcs/MockHttpTransport.java

+ 2 - 2
plugins/discovery-gce/build.gradle

@@ -6,11 +6,11 @@ esplugin {
 }
 
 versions << [
-  'google': '1.20.0'
+  'google': '1.23.0'
 ]
 
 dependencies {
-  compile "com.google.apis:google-api-services-compute:v1-rev71-${versions.google}"
+  compile "com.google.apis:google-api-services-compute:v1-rev160-${versions.google}"
   compile "com.google.api-client:google-api-client:${versions.google}"
   compile "com.google.oauth-client:google-oauth-client:${versions.google}"
   compile "com.google.http-client:google-http-client:${versions.google}"

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

@@ -1 +0,0 @@
-d3e66209ae9e749b2d6833761e7885f60f285564

+ 1 - 0
plugins/discovery-gce/licenses/google-api-client-1.23.0.jar.sha1

@@ -0,0 +1 @@
+522ea860eb48dee71dfe2c61a1fd09663539f556

+ 1 - 0
plugins/discovery-gce/licenses/google-api-services-compute-v1-rev160-1.23.0.jar.sha1

@@ -0,0 +1 @@
+004169bfe1cf0e8b2013c9c479e43b731958bc64

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

@@ -1 +0,0 @@
-2fa36fff3b5bf59a63c4f2bbfac1f88251cd7986

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

@@ -1 +0,0 @@
-93d82db2bca534960253f43424b2ba9d7638b4d2

+ 1 - 0
plugins/discovery-gce/licenses/google-http-client-1.23.0.jar.sha1

@@ -0,0 +1 @@
+8e86c84ff3c98eca6423e97780325b299133d858

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

@@ -1 +0,0 @@
-2408070b2abec043624d35b35e30450f1b663858

+ 1 - 0
plugins/discovery-gce/licenses/google-http-client-jackson2-1.23.0.jar.sha1

@@ -0,0 +1 @@
+fd6761f4046a8cb0455e6fa5f58e12b061e9826e

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

@@ -1 +0,0 @@
-1d086ac5756475ddf451af2e2df6e288d18608ca

+ 1 - 0
plugins/discovery-gce/licenses/google-oauth-client-1.23.0.jar.sha1

@@ -0,0 +1 @@
+e57ea1e2220bda5a2bd24ff17860212861f3c5cf

+ 2 - 2
plugins/repository-gcs/build.gradle

@@ -23,11 +23,11 @@ esplugin {
 }
 
 versions << [
-        'google': '1.21.0',
+        'google': '1.23.0',
 ]
 
 dependencies {
-  compile "com.google.apis:google-api-services-storage:v1-rev66-${versions.google}"
+  compile "com.google.apis:google-api-services-storage:v1-rev115-${versions.google}"
   compile "com.google.api-client:google-api-client:${versions.google}"
   compile "com.google.oauth-client:google-oauth-client:${versions.google}"
   compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"

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

@@ -1 +0,0 @@
-16a6b3c680f3bf7b81bb42790ff5c1b72c5bbedc

+ 1 - 0
plugins/repository-gcs/licenses/google-api-client-1.23.0.jar.sha1

@@ -0,0 +1 @@
+522ea860eb48dee71dfe2c61a1fd09663539f556

+ 1 - 0
plugins/repository-gcs/licenses/google-api-services-storage-v1-rev115-1.23.0.jar.sha1

@@ -0,0 +1 @@
+ba4fb6c5dc8d5ad94dedd9927ceee10a31a59abd

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

@@ -1 +0,0 @@
-eb753d716e4f8dec203deb0f8fdca86913a79029

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

@@ -1 +0,0 @@
-42631630fe1276d4d6d6397bb07d53a4e4fec278

+ 1 - 0
plugins/repository-gcs/licenses/google-http-client-1.23.0.jar.sha1

@@ -0,0 +1 @@
+8e86c84ff3c98eca6423e97780325b299133d858

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

@@ -1 +0,0 @@
-8ce17bdd15fff0fd8cf359757f29e778fc7191ad

+ 1 - 0
plugins/repository-gcs/licenses/google-http-client-jackson2-1.23.0.jar.sha1

@@ -0,0 +1 @@
+fd6761f4046a8cb0455e6fa5f58e12b061e9826e

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

@@ -1 +0,0 @@
-61ec42bbfc51aafde5eb8b4923c602c5b5965bc2

+ 1 - 0
plugins/repository-gcs/licenses/google-oauth-client-1.23.0.jar.sha1

@@ -0,0 +1 @@
+e57ea1e2220bda5a2bd24ff17860212861f3c5cf

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

@@ -271,7 +271,7 @@ public class MockHttpTransport extends com.google.api.client.testing.http.MockHt
             //            content-id: 1
             //            content-transfer-encoding: binary
             //
-            //            DELETE https://www.googleapis.com/storage/v1/b/ohifkgu/o/foo%2Ftest
+            //            DELETE https://www.googleapis.com/storage/v1/b/ohifkgu/o/foo%2Ftest HTTP/1.1
             //
             //
             //            --__END_OF_PART__
@@ -280,7 +280,7 @@ public class MockHttpTransport extends com.google.api.client.testing.http.MockHt
             //            content-id: 2
             //            content-transfer-encoding: binary
             //
-            //            DELETE https://www.googleapis.com/storage/v1/b/ohifkgu/o/bar%2Ftest
+            //            DELETE https://www.googleapis.com/storage/v1/b/ohifkgu/o/bar%2Ftest HTTP/1.1
             //
             //
             //            --__END_OF_PART__--
@@ -291,6 +291,11 @@ public class MockHttpTransport extends com.google.api.client.testing.http.MockHt
                 req.getStreamingContent().writeTo(os);
 
                 Streams.readAllLines(new ByteArrayInputStream(os.toByteArray()), line -> {
+                    final int indexOfHttp = line.indexOf(" HTTP/1.1");
+                    if (indexOfHttp > 0) {
+                        line = line.substring(0, indexOfHttp);
+                    }
+
                     Handler handler = handlers.retrieve(line, params);
                     if (handler != null) {
                         try {