Skip to content

SNAPSHOTS: Upgrade GCS Dependencies to 1.55.0 #36634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 14, 2018
Merged

SNAPSHOTS: Upgrade GCS Dependencies to 1.55.0 #36634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions plugins/repository-gcs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ esplugin {
}

dependencies {
compile 'com.google.cloud:google-cloud-storage:1.40.0'
compile 'com.google.cloud:google-cloud-core:1.40.0'
compile 'com.google.cloud:google-cloud-storage:1.55.0'
compile 'com.google.cloud:google-cloud-core:1.55.0'
compile 'com.google.guava:guava:20.0'
compile "joda-time:joda-time:${versions.joda}"
compile 'com.google.http-client:google-http-client:1.24.1'
Expand All @@ -40,7 +40,7 @@ dependencies {
compile 'com.google.code.gson:gson:2.7'
compile 'com.google.api.grpc:proto-google-common-protos:1.12.0'
compile 'com.google.api.grpc:proto-google-iam-v1:0.12.0'
compile 'com.google.cloud:google-cloud-core-http:1.40.0'
compile 'com.google.cloud:google-cloud-core-http:1.55.0'
compile 'com.google.auth:google-auth-library-credentials:0.10.0'
compile 'com.google.auth:google-auth-library-oauth2-http:0.10.0'
compile 'com.google.oauth-client:google-oauth-client:1.24.1'
Expand Down
1 change: 0 additions & 1 deletion plugins/repository-gcs/licenses/google-cloud-core-1.40.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-gcs/licenses/google-cloud-core-1.55.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9e50a2a559128b7938cfd6598753d4c7383472dc
1 change: 0 additions & 1 deletion plugins/repository-gcs/licenses/google-cloud-core-http-1.40.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-gcs/licenses/google-cloud-core-http-1.55.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f26862445efffd8cb3a7f4b1f2a91b7c5143ee1f
1 change: 0 additions & 1 deletion plugins/repository-gcs/licenses/google-cloud-storage-1.40.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-gcs/licenses/google-cloud-storage-1.55.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ca19f55eeb96609243bf3a15fdafd497432f6673
5 changes: 5 additions & 0 deletions plugins/repository-gcs/src/test/java/org/elasticsearch/repositories/gcs/MockStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ public Bucket get(String bucket, BucketGetOption... options) {
}
}

@Override
public Bucket lockRetentionPolicy(final BucketInfo bucket, final BucketTargetOption... options) {
Copy link
Contributor Author

@original-brownbear original-brownbear Dec 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

API change in the dependency made overriding this necessary.
Since we don't use it yet, I added just a dummy override.

return null;
}

@Override
public Blob get(BlobId blob) {
if (bucketName.equals(blob.getBucket())) {
Expand Down