diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index e07b5002b20..9f68046ec29 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -39,16 +39,16 @@ esplugin { } dependencies { - api 'com.google.cloud:google-cloud-storage:1.106.0' + api 'com.google.cloud:google-cloud-storage:1.113.1' api 'com.google.cloud:google-cloud-core:1.93.3' runtimeOnly 'com.google.guava:guava:26.0-jre' - api 'com.google.http-client:google-http-client:1.34.2' + api 'com.google.http-client:google-http-client:1.35.0' api "commons-logging:commons-logging:${versions.commonslogging}" api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}" api "commons-codec:commons-codec:${versions.commonscodec}" api 'com.google.api:api-common:1.8.1' api 'com.google.api:gax:1.54.0' - api 'org.threeten:threetenbp:1.4.1' + api 'org.threeten:threetenbp:1.4.4' api 'com.google.protobuf:protobuf-java-util:3.11.3' api 'com.google.protobuf:protobuf-java:3.11.3' api 'com.google.code.gson:gson:2.7' @@ -58,14 +58,14 @@ dependencies { api 'com.google.auth:google-auth-library-credentials:0.20.0' api 'com.google.auth:google-auth-library-oauth2-http:0.20.0' api 'com.google.oauth-client:google-oauth-client:1.28.0' - api 'com.google.api-client:google-api-client:1.30.9' - api 'com.google.http-client:google-http-client-appengine:1.34.2' - api 'com.google.http-client:google-http-client-jackson2:1.34.2' + api 'com.google.api-client:google-api-client:1.30.10' + api 'com.google.http-client:google-http-client-appengine:1.35.0' + api 'com.google.http-client:google-http-client-jackson2:1.35.0' api 'com.google.api:gax-httpjson:0.62.0' - api 'io.grpc:grpc-context:1.12.0' + api 'io.grpc:grpc-context:1.29.0' api 'io.opencensus:opencensus-api:0.18.0' api 'io.opencensus:opencensus-contrib-http-util:0.18.0' - api 'com.google.apis:google-api-services-storage:v1-rev20200226-1.30.9' + api 'com.google.apis:google-api-services-storage:v1-rev20200814-1.30.10' testImplementation project(':test:fixtures:gcs-fixture') } diff --git a/plugins/repository-gcs/licenses/google-api-client-1.30.10.jar.sha1 b/plugins/repository-gcs/licenses/google-api-client-1.30.10.jar.sha1 new file mode 100644 index 00000000000..62c51887ee1 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-api-client-1.30.10.jar.sha1 @@ -0,0 +1 @@ +2de98417199785982e1f037fb8b52613f57175ae \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-api-client-1.30.9.jar.sha1 b/plugins/repository-gcs/licenses/google-api-client-1.30.9.jar.sha1 deleted file mode 100644 index cda9d1bd0ec..00000000000 --- a/plugins/repository-gcs/licenses/google-api-client-1.30.9.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8fc8641740ee0c26715738fb4d902779b96217d6 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-api-services-storage-v1-rev20200226-1.30.9.jar.sha1 b/plugins/repository-gcs/licenses/google-api-services-storage-v1-rev20200226-1.30.9.jar.sha1 deleted file mode 100644 index 28b49b7f52e..00000000000 --- a/plugins/repository-gcs/licenses/google-api-services-storage-v1-rev20200226-1.30.9.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -053c15bb46f6f3f623e94c587a67d975ab140bc8 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-api-services-storage-v1-rev20200814-1.30.10.jar.sha1 b/plugins/repository-gcs/licenses/google-api-services-storage-v1-rev20200814-1.30.10.jar.sha1 new file mode 100644 index 00000000000..e399aa58654 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-api-services-storage-v1-rev20200814-1.30.10.jar.sha1 @@ -0,0 +1 @@ +fe3b480958961fc7144da10ce3653065d5eb5490 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-cloud-storage-1.106.0.jar.sha1 b/plugins/repository-gcs/licenses/google-cloud-storage-1.106.0.jar.sha1 deleted file mode 100644 index 6b1d3969c81..00000000000 --- a/plugins/repository-gcs/licenses/google-cloud-storage-1.106.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -08b9c0a551b02028fe6c4c666236b21796099238 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-cloud-storage-1.113.1.jar.sha1 b/plugins/repository-gcs/licenses/google-cloud-storage-1.113.1.jar.sha1 new file mode 100644 index 00000000000..22fc078b36a --- /dev/null +++ b/plugins/repository-gcs/licenses/google-cloud-storage-1.113.1.jar.sha1 @@ -0,0 +1 @@ +fd291ed57c1223bbb31363c4aa88c55faf0000c7 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-http-client-1.34.2.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-1.34.2.jar.sha1 deleted file mode 100644 index 223dd2e3a15..00000000000 --- a/plugins/repository-gcs/licenses/google-http-client-1.34.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -58b4c500b5ce58271f1a6c5f6767aa8721158ea4 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-http-client-1.35.0.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-1.35.0.jar.sha1 new file mode 100644 index 00000000000..802a6ab3a8d --- /dev/null +++ b/plugins/repository-gcs/licenses/google-http-client-1.35.0.jar.sha1 @@ -0,0 +1 @@ +f2348dd57d5417c29388bd430f5055dca863c600 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-http-client-appengine-1.34.2.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-appengine-1.34.2.jar.sha1 deleted file mode 100644 index 884514d21e5..00000000000 --- a/plugins/repository-gcs/licenses/google-http-client-appengine-1.34.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dbcfa59e3de5f29ed5ab36dfc9ec8f9dbf279ef9 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-http-client-appengine-1.35.0.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-appengine-1.35.0.jar.sha1 new file mode 100644 index 00000000000..8bf444887d3 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-http-client-appengine-1.35.0.jar.sha1 @@ -0,0 +1 @@ +394d1e1376538931ec3d4eeed654f9da911b95eb \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-http-client-jackson2-1.34.2.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-jackson2-1.34.2.jar.sha1 deleted file mode 100644 index 6c680aef398..00000000000 --- a/plugins/repository-gcs/licenses/google-http-client-jackson2-1.34.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fc5cd5e7b6252bae6a65ef2a1091476afb25b7c7 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-http-client-jackson2-1.35.0.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-jackson2-1.35.0.jar.sha1 new file mode 100644 index 00000000000..0342f577793 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-http-client-jackson2-1.35.0.jar.sha1 @@ -0,0 +1 @@ +c1c2a08792b935f3345590783ada872f4a0997f1 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/grpc-context-1.12.0.jar.sha1 b/plugins/repository-gcs/licenses/grpc-context-1.12.0.jar.sha1 deleted file mode 100644 index 57f37a81c96..00000000000 --- a/plugins/repository-gcs/licenses/grpc-context-1.12.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5b63a170b786051a42cce08118d5ea3c8f60f749 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/grpc-context-1.29.0.jar.sha1 b/plugins/repository-gcs/licenses/grpc-context-1.29.0.jar.sha1 new file mode 100644 index 00000000000..a549827edd2 --- /dev/null +++ b/plugins/repository-gcs/licenses/grpc-context-1.29.0.jar.sha1 @@ -0,0 +1 @@ +1d8a441110f86f8927543dc3007639080441ea3c \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/threetenbp-1.4.1.jar.sha1 b/plugins/repository-gcs/licenses/threetenbp-1.4.1.jar.sha1 deleted file mode 100644 index 682387ad67c..00000000000 --- a/plugins/repository-gcs/licenses/threetenbp-1.4.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8e0de17c5077523503812837fa069459103fb714 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/threetenbp-1.4.4.jar.sha1 b/plugins/repository-gcs/licenses/threetenbp-1.4.4.jar.sha1 new file mode 100644 index 00000000000..0f7ee08a6d2 --- /dev/null +++ b/plugins/repository-gcs/licenses/threetenbp-1.4.4.jar.sha1 @@ -0,0 +1 @@ +bbe3cc15e8ea16863435009af8ca40dd97770240 \ No newline at end of file diff --git a/x-pack/snapshot-tool/build.gradle b/x-pack/snapshot-tool/build.gradle index 69bc93ecd36..37e5c4bb639 100644 --- a/x-pack/snapshot-tool/build.gradle +++ b/x-pack/snapshot-tool/build.gradle @@ -30,9 +30,9 @@ dependencies { api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}" // GCS dependencies - api 'com.google.cloud:google-cloud-storage:1.106.0' + api 'com.google.cloud:google-cloud-storage:1.113.1' api 'com.google.cloud:google-cloud-core:1.93.3' - api 'com.google.http-client:google-http-client:1.34.2' + api 'com.google.http-client:google-http-client:1.35.0' api "org.apache.httpcomponents:httpclient:${versions.httpclient}" api "org.apache.httpcomponents:httpcore:${versions.httpcore}" api "commons-logging:commons-logging:${versions.commonslogging}" @@ -40,7 +40,7 @@ dependencies { api "commons-codec:commons-codec:${versions.commonscodec}" api 'com.google.api:api-common:1.8.1' api 'com.google.api:gax:1.54.0' - api 'org.threeten:threetenbp:1.4.1' + api 'org.threeten:threetenbp:1.4.4' api 'com.google.protobuf:protobuf-java-util:3.11.3' api 'com.google.protobuf:protobuf-java:3.11.3' api 'com.google.code.gson:gson:2.7' @@ -50,14 +50,14 @@ dependencies { api 'com.google.auth:google-auth-library-credentials:0.20.0' api 'com.google.auth:google-auth-library-oauth2-http:0.20.0' api 'com.google.oauth-client:google-oauth-client:1.28.0' - api 'com.google.api-client:google-api-client:1.30.9' - api 'com.google.http-client:google-http-client-appengine:1.34.2' - api 'com.google.http-client:google-http-client-jackson2:1.34.2' + api 'com.google.api-client:google-api-client:1.30.10' + api 'com.google.http-client:google-http-client-appengine:1.35.0' + api 'com.google.http-client:google-http-client-jackson2:1.35.0' api 'com.google.api:gax-httpjson:0.62.0' - api 'io.grpc:grpc-context:1.12.0' + api 'io.grpc:grpc-context:1.29.0' api 'io.opencensus:opencensus-api:0.18.0' api 'io.opencensus:opencensus-contrib-http-util:0.18.0' - api 'com.google.apis:google-api-services-storage:v1-rev20200226-1.30.9' + api 'com.google.apis:google-api-services-storage:v1-rev20200814-1.30.10' runtimeOnly 'com.google.guava:guava:26.0-jre' // HACK: javax.xml.bind was removed from default modules in java 9, so we pull the api in here, diff --git a/x-pack/snapshot-tool/licenses/google-api-client-1.30.10.jar.sha1 b/x-pack/snapshot-tool/licenses/google-api-client-1.30.10.jar.sha1 new file mode 100644 index 00000000000..62c51887ee1 --- /dev/null +++ b/x-pack/snapshot-tool/licenses/google-api-client-1.30.10.jar.sha1 @@ -0,0 +1 @@ +2de98417199785982e1f037fb8b52613f57175ae \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/google-api-client-1.30.9.jar.sha1 b/x-pack/snapshot-tool/licenses/google-api-client-1.30.9.jar.sha1 deleted file mode 100644 index cda9d1bd0ec..00000000000 --- a/x-pack/snapshot-tool/licenses/google-api-client-1.30.9.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8fc8641740ee0c26715738fb4d902779b96217d6 \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/google-api-services-storage-v1-rev20200226-1.30.9.jar.sha1 b/x-pack/snapshot-tool/licenses/google-api-services-storage-v1-rev20200226-1.30.9.jar.sha1 deleted file mode 100644 index 28b49b7f52e..00000000000 --- a/x-pack/snapshot-tool/licenses/google-api-services-storage-v1-rev20200226-1.30.9.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -053c15bb46f6f3f623e94c587a67d975ab140bc8 \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/google-api-services-storage-v1-rev20200814-1.30.10.jar.sha1 b/x-pack/snapshot-tool/licenses/google-api-services-storage-v1-rev20200814-1.30.10.jar.sha1 new file mode 100644 index 00000000000..e399aa58654 --- /dev/null +++ b/x-pack/snapshot-tool/licenses/google-api-services-storage-v1-rev20200814-1.30.10.jar.sha1 @@ -0,0 +1 @@ +fe3b480958961fc7144da10ce3653065d5eb5490 \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/google-cloud-storage-1.106.0.jar.sha1 b/x-pack/snapshot-tool/licenses/google-cloud-storage-1.106.0.jar.sha1 deleted file mode 100644 index 6b1d3969c81..00000000000 --- a/x-pack/snapshot-tool/licenses/google-cloud-storage-1.106.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -08b9c0a551b02028fe6c4c666236b21796099238 \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/google-cloud-storage-1.113.1.jar.sha1 b/x-pack/snapshot-tool/licenses/google-cloud-storage-1.113.1.jar.sha1 new file mode 100644 index 00000000000..22fc078b36a --- /dev/null +++ b/x-pack/snapshot-tool/licenses/google-cloud-storage-1.113.1.jar.sha1 @@ -0,0 +1 @@ +fd291ed57c1223bbb31363c4aa88c55faf0000c7 \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/google-http-client-1.34.2.jar.sha1 b/x-pack/snapshot-tool/licenses/google-http-client-1.34.2.jar.sha1 deleted file mode 100644 index 223dd2e3a15..00000000000 --- a/x-pack/snapshot-tool/licenses/google-http-client-1.34.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -58b4c500b5ce58271f1a6c5f6767aa8721158ea4 \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/google-http-client-1.35.0.jar.sha1 b/x-pack/snapshot-tool/licenses/google-http-client-1.35.0.jar.sha1 new file mode 100644 index 00000000000..802a6ab3a8d --- /dev/null +++ b/x-pack/snapshot-tool/licenses/google-http-client-1.35.0.jar.sha1 @@ -0,0 +1 @@ +f2348dd57d5417c29388bd430f5055dca863c600 \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/google-http-client-appengine-1.34.2.jar.sha1 b/x-pack/snapshot-tool/licenses/google-http-client-appengine-1.34.2.jar.sha1 deleted file mode 100644 index 884514d21e5..00000000000 --- a/x-pack/snapshot-tool/licenses/google-http-client-appengine-1.34.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dbcfa59e3de5f29ed5ab36dfc9ec8f9dbf279ef9 \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/google-http-client-appengine-1.35.0.jar.sha1 b/x-pack/snapshot-tool/licenses/google-http-client-appengine-1.35.0.jar.sha1 new file mode 100644 index 00000000000..8bf444887d3 --- /dev/null +++ b/x-pack/snapshot-tool/licenses/google-http-client-appengine-1.35.0.jar.sha1 @@ -0,0 +1 @@ +394d1e1376538931ec3d4eeed654f9da911b95eb \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/google-http-client-jackson2-1.34.2.jar.sha1 b/x-pack/snapshot-tool/licenses/google-http-client-jackson2-1.34.2.jar.sha1 deleted file mode 100644 index 6c680aef398..00000000000 --- a/x-pack/snapshot-tool/licenses/google-http-client-jackson2-1.34.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fc5cd5e7b6252bae6a65ef2a1091476afb25b7c7 \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/google-http-client-jackson2-1.35.0.jar.sha1 b/x-pack/snapshot-tool/licenses/google-http-client-jackson2-1.35.0.jar.sha1 new file mode 100644 index 00000000000..0342f577793 --- /dev/null +++ b/x-pack/snapshot-tool/licenses/google-http-client-jackson2-1.35.0.jar.sha1 @@ -0,0 +1 @@ +c1c2a08792b935f3345590783ada872f4a0997f1 \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/grpc-context-1.12.0.jar.sha1 b/x-pack/snapshot-tool/licenses/grpc-context-1.12.0.jar.sha1 deleted file mode 100644 index 57f37a81c96..00000000000 --- a/x-pack/snapshot-tool/licenses/grpc-context-1.12.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5b63a170b786051a42cce08118d5ea3c8f60f749 \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/grpc-context-1.29.0.jar.sha1 b/x-pack/snapshot-tool/licenses/grpc-context-1.29.0.jar.sha1 new file mode 100644 index 00000000000..a549827edd2 --- /dev/null +++ b/x-pack/snapshot-tool/licenses/grpc-context-1.29.0.jar.sha1 @@ -0,0 +1 @@ +1d8a441110f86f8927543dc3007639080441ea3c \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/threetenbp-1.4.1.jar.sha1 b/x-pack/snapshot-tool/licenses/threetenbp-1.4.1.jar.sha1 deleted file mode 100644 index 682387ad67c..00000000000 --- a/x-pack/snapshot-tool/licenses/threetenbp-1.4.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8e0de17c5077523503812837fa069459103fb714 \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/threetenbp-1.4.4.jar.sha1 b/x-pack/snapshot-tool/licenses/threetenbp-1.4.4.jar.sha1 new file mode 100644 index 00000000000..0f7ee08a6d2 --- /dev/null +++ b/x-pack/snapshot-tool/licenses/threetenbp-1.4.4.jar.sha1 @@ -0,0 +1 @@ +bbe3cc15e8ea16863435009af8ca40dd97770240 \ No newline at end of file