Skip to content

Commit c5e5a97

Browse files
authored
Update Google Cloud Storage Library for Java (#32940)
This commit updated the google-cloud-storage library from version 1.28.0 to version 1.40.0.
1 parent f4e9729 commit c5e5a97

File tree

69 files changed

+167
-626
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+167
-626
lines changed

plugins/repository-gcs/build.gradle

Lines changed: 46 additions & 154 deletions
Original file line numberDiff line numberDiff line change
@@ -23,39 +23,57 @@ esplugin {
2323
}
2424

2525
dependencies {
26-
compile 'com.google.cloud:google-cloud-storage:1.28.0'
27-
compile 'com.google.cloud:google-cloud-core:1.28.0'
28-
compile 'com.google.cloud:google-cloud-core-http:1.28.0'
29-
compile 'com.google.auth:google-auth-library-oauth2-http:0.9.1'
30-
compile 'com.google.auth:google-auth-library-credentials:0.9.1'
31-
compile 'com.google.oauth-client:google-oauth-client:1.23.0'
32-
compile 'com.google.http-client:google-http-client:1.23.0'
33-
compile 'com.google.http-client:google-http-client-jackson:1.23.0'
34-
compile 'com.google.http-client:google-http-client-jackson2:1.23.0'
35-
compile 'com.google.http-client:google-http-client-appengine:1.23.0'
36-
compile 'com.google.api-client:google-api-client:1.23.0'
37-
compile 'com.google.api:gax:1.25.0'
38-
compile 'com.google.api:gax-httpjson:0.40.0'
39-
compile 'com.google.api:api-common:1.5.0'
40-
compile 'com.google.api.grpc:proto-google-common-protos:1.8.0'
26+
compile 'com.google.cloud:google-cloud-storage:1.40.0'
27+
compile 'com.google.cloud:google-cloud-core:1.40.0'
4128
compile 'com.google.guava:guava:20.0'
42-
compile 'com.google.apis:google-api-services-storage:v1-rev115-1.23.0'
43-
compile 'org.codehaus.jackson:jackson-core-asl:1.9.13'
44-
compile 'io.grpc:grpc-context:1.9.0'
45-
compile 'io.opencensus:opencensus-api:0.11.1'
46-
compile 'io.opencensus:opencensus-contrib-http-util:0.11.1'
47-
compile 'org.threeten:threetenbp:1.3.6'
29+
compile 'joda-time:joda-time:2.10'
30+
compile 'com.google.http-client:google-http-client:1.24.1'
31+
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
32+
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
33+
compile "commons-logging:commons-logging:${versions.commonslogging}"
34+
compile "commons-codec:commons-codec:${versions.commonscodec}"
35+
compile 'com.google.api:api-common:1.7.0'
36+
compile 'com.google.api:gax:1.30.0'
37+
compile 'org.threeten:threetenbp:1.3.3'
38+
compile 'com.google.protobuf:protobuf-java-util:3.6.0'
39+
compile 'com.google.protobuf:protobuf-java:3.6.0'
40+
compile 'com.google.code.gson:gson:2.7'
41+
compile 'com.google.api.grpc:proto-google-common-protos:1.12.0'
42+
compile 'com.google.api.grpc:proto-google-iam-v1:0.12.0'
43+
compile 'com.google.cloud:google-cloud-core-http:1.40.0'
44+
compile 'com.google.auth:google-auth-library-credentials:0.10.0'
45+
compile 'com.google.auth:google-auth-library-oauth2-http:0.10.0'
46+
compile 'com.google.oauth-client:google-oauth-client:1.24.1'
47+
compile 'com.google.api-client:google-api-client:1.24.1'
48+
compile 'com.google.http-client:google-http-client-appengine:1.24.1'
49+
compile 'com.google.http-client:google-http-client-jackson:1.24.1'
50+
compile 'org.codehaus.jackson:jackson-core-asl:1.9.11'
51+
compile 'com.google.http-client:google-http-client-jackson2:1.24.1'
52+
compile "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
53+
compile 'com.google.api:gax-httpjson:0.47.0'
54+
compile 'io.opencensus:opencensus-api:0.15.0'
55+
compile 'io.grpc:grpc-context:1.12.0'
56+
compile 'io.opencensus:opencensus-contrib-http-util:0.15.0'
57+
compile 'com.google.apis:google-api-services-storage:v1-rev135-1.24.1'
4858
}
4959

5060
dependencyLicenses {
5161
mapping from: /google-cloud-.*/, to: 'google-cloud'
5262
mapping from: /google-auth-.*/, to: 'google-auth'
5363
mapping from: /google-http-.*/, to: 'google-http'
5464
mapping from: /opencensus.*/, to: 'opencensus'
65+
mapping from: /jackson-.*/, to: 'jackson'
66+
mapping from: /http.*/, to: 'httpclient'
67+
mapping from: /protobuf.*/, to: 'protobuf'
68+
mapping from: /proto-google.*/, to: 'proto-google'
5569
}
5670

5771
thirdPartyAudit.excludes = [
5872
// uses internal java api: sun.misc.Unsafe
73+
'com.google.protobuf.UnsafeUtil',
74+
'com.google.protobuf.UnsafeUtil$1',
75+
'com.google.protobuf.UnsafeUtil$JvmMemoryAccessor',
76+
'com.google.protobuf.UnsafeUtil$MemoryAccessor',
5977
'com.google.common.cache.Striped64',
6078
'com.google.common.cache.Striped64$1',
6179
'com.google.common.cache.Striped64$Cell',
@@ -87,139 +105,13 @@ thirdPartyAudit.excludes = [
87105
'com.google.appengine.api.urlfetch.HTTPResponse',
88106
'com.google.appengine.api.urlfetch.URLFetchService',
89107
'com.google.appengine.api.urlfetch.URLFetchServiceFactory',
90-
'com.google.gson.Gson',
91-
'com.google.gson.GsonBuilder',
92-
'com.google.gson.TypeAdapter',
93-
'com.google.gson.stream.JsonReader',
94-
'com.google.gson.stream.JsonWriter',
95-
'com.google.iam.v1.Binding$Builder',
96-
'com.google.iam.v1.Binding',
97-
'com.google.iam.v1.Policy$Builder',
98-
'com.google.iam.v1.Policy',
99-
'com.google.protobuf.AbstractMessageLite$Builder',
100-
'com.google.protobuf.AbstractParser',
101-
'com.google.protobuf.Any$Builder',
102-
'com.google.protobuf.Any',
103-
'com.google.protobuf.AnyOrBuilder',
104-
'com.google.protobuf.AnyProto',
105-
'com.google.protobuf.Api$Builder',
106-
'com.google.protobuf.Api',
107-
'com.google.protobuf.ApiOrBuilder',
108-
'com.google.protobuf.ApiProto',
109-
'com.google.protobuf.ByteString',
110-
'com.google.protobuf.CodedInputStream',
111-
'com.google.protobuf.CodedOutputStream',
112-
'com.google.protobuf.DescriptorProtos',
113-
'com.google.protobuf.Descriptors$Descriptor',
114-
'com.google.protobuf.Descriptors$EnumDescriptor',
115-
'com.google.protobuf.Descriptors$EnumValueDescriptor',
116-
'com.google.protobuf.Descriptors$FieldDescriptor',
117-
'com.google.protobuf.Descriptors$FileDescriptor$InternalDescriptorAssigner',
118-
'com.google.protobuf.Descriptors$FileDescriptor',
119-
'com.google.protobuf.Descriptors$OneofDescriptor',
120-
'com.google.protobuf.Duration$Builder',
121-
'com.google.protobuf.Duration',
122-
'com.google.protobuf.DurationOrBuilder',
123-
'com.google.protobuf.DurationProto',
124-
'com.google.protobuf.EmptyProto',
125-
'com.google.protobuf.Enum$Builder',
126-
'com.google.protobuf.Enum',
127-
'com.google.protobuf.EnumOrBuilder',
128-
'com.google.protobuf.ExtensionRegistry',
129-
'com.google.protobuf.ExtensionRegistryLite',
130-
'com.google.protobuf.FloatValue$Builder',
131-
'com.google.protobuf.FloatValue',
132-
'com.google.protobuf.FloatValueOrBuilder',
133-
'com.google.protobuf.GeneratedMessage$GeneratedExtension',
134-
'com.google.protobuf.GeneratedMessage',
135-
'com.google.protobuf.GeneratedMessageV3$Builder',
136-
'com.google.protobuf.GeneratedMessageV3$BuilderParent',
137-
'com.google.protobuf.GeneratedMessageV3$FieldAccessorTable',
138-
'com.google.protobuf.GeneratedMessageV3',
139-
'com.google.protobuf.Internal$EnumLite',
140-
'com.google.protobuf.Internal$EnumLiteMap',
141-
'com.google.protobuf.Internal',
142-
'com.google.protobuf.InvalidProtocolBufferException',
143-
'com.google.protobuf.LazyStringArrayList',
144-
'com.google.protobuf.LazyStringList',
145-
'com.google.protobuf.MapEntry$Builder',
146-
'com.google.protobuf.MapEntry',
147-
'com.google.protobuf.MapField',
148-
'com.google.protobuf.Message',
149-
'com.google.protobuf.MessageOrBuilder',
150-
'com.google.protobuf.Parser',
151-
'com.google.protobuf.ProtocolMessageEnum',
152-
'com.google.protobuf.ProtocolStringList',
153-
'com.google.protobuf.RepeatedFieldBuilderV3',
154-
'com.google.protobuf.SingleFieldBuilderV3',
155-
'com.google.protobuf.Struct$Builder',
156-
'com.google.protobuf.Struct',
157-
'com.google.protobuf.StructOrBuilder',
158-
'com.google.protobuf.StructProto',
159-
'com.google.protobuf.Timestamp$Builder',
160-
'com.google.protobuf.Timestamp',
161-
'com.google.protobuf.TimestampProto',
162-
'com.google.protobuf.Type$Builder',
163-
'com.google.protobuf.Type',
164-
'com.google.protobuf.TypeOrBuilder',
165-
'com.google.protobuf.TypeProto',
166-
'com.google.protobuf.UInt32Value$Builder',
167-
'com.google.protobuf.UInt32Value',
168-
'com.google.protobuf.UInt32ValueOrBuilder',
169-
'com.google.protobuf.UnknownFieldSet$Builder',
170-
'com.google.protobuf.UnknownFieldSet',
171-
'com.google.protobuf.WireFormat$FieldType',
172-
'com.google.protobuf.WrappersProto',
173-
'com.google.protobuf.util.Timestamps',
174-
'org.apache.http.ConnectionReuseStrategy',
175-
'org.apache.http.Header',
176-
'org.apache.http.HttpEntity',
177-
'org.apache.http.HttpEntityEnclosingRequest',
178-
'org.apache.http.HttpHost',
179-
'org.apache.http.HttpRequest',
180-
'org.apache.http.HttpResponse',
181-
'org.apache.http.HttpVersion',
182-
'org.apache.http.RequestLine',
183-
'org.apache.http.StatusLine',
184-
'org.apache.http.client.AuthenticationHandler',
185-
'org.apache.http.client.HttpClient',
186-
'org.apache.http.client.HttpRequestRetryHandler',
187-
'org.apache.http.client.RedirectHandler',
188-
'org.apache.http.client.RequestDirector',
189-
'org.apache.http.client.UserTokenHandler',
190-
'org.apache.http.client.methods.HttpDelete',
191-
'org.apache.http.client.methods.HttpEntityEnclosingRequestBase',
192-
'org.apache.http.client.methods.HttpGet',
193-
'org.apache.http.client.methods.HttpHead',
194-
'org.apache.http.client.methods.HttpOptions',
195-
'org.apache.http.client.methods.HttpPost',
196-
'org.apache.http.client.methods.HttpPut',
197-
'org.apache.http.client.methods.HttpRequestBase',
198-
'org.apache.http.client.methods.HttpTrace',
199-
'org.apache.http.conn.ClientConnectionManager',
200-
'org.apache.http.conn.ConnectionKeepAliveStrategy',
201-
'org.apache.http.conn.params.ConnManagerParams',
202-
'org.apache.http.conn.params.ConnPerRouteBean',
203-
'org.apache.http.conn.params.ConnRouteParams',
204-
'org.apache.http.conn.routing.HttpRoutePlanner',
205-
'org.apache.http.conn.scheme.PlainSocketFactory',
206-
'org.apache.http.conn.scheme.Scheme',
207-
'org.apache.http.conn.scheme.SchemeRegistry',
208-
'org.apache.http.conn.ssl.SSLSocketFactory',
209-
'org.apache.http.conn.ssl.X509HostnameVerifier',
210-
'org.apache.http.entity.AbstractHttpEntity',
211-
'org.apache.http.impl.client.DefaultHttpClient',
212-
'org.apache.http.impl.client.DefaultHttpRequestRetryHandler',
213-
'org.apache.http.impl.conn.ProxySelectorRoutePlanner',
214-
'org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager',
215-
'org.apache.http.message.BasicHttpResponse',
216-
'org.apache.http.params.BasicHttpParams',
217-
'org.apache.http.params.HttpConnectionParams',
218-
'org.apache.http.params.HttpParams',
219-
'org.apache.http.params.HttpProtocolParams',
220-
'org.apache.http.protocol.HttpContext',
221-
'org.apache.http.protocol.HttpProcessor',
222-
'org.apache.http.protocol.HttpRequestExecutor'
108+
// commons-logging optional dependencies
109+
'org.apache.avalon.framework.logger.Logger',
110+
'org.apache.log.Hierarchy',
111+
'org.apache.log.Logger',
112+
// commons-logging provided dependencies
113+
'javax.servlet.ServletContextEvent',
114+
'javax.servlet.ServletContextListener'
223115
]
224116

225117
check {

plugins/repository-gcs/licenses/api-common-1.5.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+
ea59fb8b2450999345035dec8a6f472543391766
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4b95f4897fa13f2cd904aee711aeafc0c5295cd8
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f

plugins/repository-gcs/licenses/gax-1.25.0.jar.sha1

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

0 commit comments

Comments
 (0)