Skip to content

Use apache client in GCS repository #122809

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

Closed
wants to merge 7 commits into from
Closed

Use apache client in GCS repository #122809

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2bcf21a
Use apache client in GCS repository
nicktindall Feb 18, 2025
7958a69
Assert we have a reference to the request
nicktindall Feb 18, 2025
cfeeb85
Change dependency scope
nicktindall Feb 18, 2025
c45459c
Align notices
nicktindall Feb 18, 2025
3757768
Align notices
nicktindall Feb 18, 2025
2e67a42
Fix exposed settings test
nicktindall Feb 18, 2025
686e6f4
Minor tweaks
nicktindall Feb 18, 2025
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
5 changes: 5 additions & 0 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,11 @@
<sha256 value="e395dd1765e3e6bceb0c610706bcf4128de84bd6e65cf1d4adbf998b4114161c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.http-client" name="google-http-client-apache-v2" version="1.42.3">
<artifact name="google-http-client-apache-v2-1.42.3.jar">
<sha256 value="86d112c6f7e55c8f6d1bfbd47a02d25afd072c60a80dea8ef616fba278637600" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.http-client" name="google-http-client-appengine" version="1.42.3">
<artifact name="google-http-client-appengine-1.42.3.jar">
<sha256 value="3a876b1f704ac6d8500b8430b288dbce78c52dc18c43c008a587a7377bb81e2e" origin="Generated by Gradle"/>
Expand Down
49 changes: 3 additions & 46 deletions modules/repository-gcs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ dependencies {
api 'io.opencensus:opencensus-api:0.31.1'
api 'io.opencensus:opencensus-contrib-http-util:0.31.1'
api 'com.google.apis:google-api-services-storage:v1-rev20220705-2.0.0'

testImplementation "org.apache.httpcomponents:httpclient:${versions.httpclient}"
testImplementation "org.apache.httpcomponents:httpcore:${versions.httpcore}"
api 'com.google.http-client:google-http-client-apache-v2:1.42.3'
api "org.apache.httpcomponents:httpclient:${versions.httpclient}"
api "org.apache.httpcomponents:httpcore:${versions.httpcore}"

testImplementation project(':test:fixtures:gcs-fixture')
yamlRestTestImplementation project(':test:fixtures:gcs-fixture')
Expand Down Expand Up @@ -103,7 +103,6 @@ tasks.named("thirdPartyAudit").configure {
)

ignoreMissingClasses(
'com.google.api.client.http.apache.v2.ApacheHttpTransport',
'com.google.appengine.api.datastore.Blob',
'com.google.appengine.api.datastore.DatastoreService',
'com.google.appengine.api.datastore.DatastoreServiceFactory',
Expand All @@ -129,48 +128,6 @@ tasks.named("thirdPartyAudit").configure {
'org.apache.log.Logger',
'javax.jms.Message',

// optional apache http client dependencies
'org.apache.http.ConnectionReuseStrategy',
'org.apache.http.Header',
'org.apache.http.HttpEntity',
'org.apache.http.HttpEntityEnclosingRequest',
'org.apache.http.HttpHost',
'org.apache.http.HttpRequest',
'org.apache.http.HttpResponse',
'org.apache.http.HttpVersion',
'org.apache.http.RequestLine',
'org.apache.http.StatusLine',
'org.apache.http.client.AuthenticationHandler',
'org.apache.http.client.HttpClient',
'org.apache.http.client.HttpRequestRetryHandler',
'org.apache.http.client.RedirectHandler',
'org.apache.http.client.RequestDirector',
'org.apache.http.client.UserTokenHandler',
'org.apache.http.client.methods.HttpEntityEnclosingRequestBase',
'org.apache.http.client.methods.HttpRequestBase',
'org.apache.http.config.Registry',
'org.apache.http.config.RegistryBuilder',
'org.apache.http.conn.ClientConnectionManager',
'org.apache.http.conn.ConnectionKeepAliveStrategy',
'org.apache.http.conn.params.ConnManagerParams',
'org.apache.http.conn.params.ConnRouteParams',
'org.apache.http.conn.routing.HttpRoutePlanner',
'org.apache.http.conn.scheme.PlainSocketFactory',
'org.apache.http.conn.scheme.SchemeRegistry',
'org.apache.http.conn.socket.PlainConnectionSocketFactory',
'org.apache.http.conn.ssl.SSLSocketFactory',
'org.apache.http.conn.ssl.X509HostnameVerifier',
'org.apache.http.entity.AbstractHttpEntity',
'org.apache.http.impl.client.DefaultHttpClient',
'org.apache.http.impl.client.HttpClientBuilder',
'org.apache.http.impl.conn.PoolingHttpClientConnectionManager',
'org.apache.http.params.HttpConnectionParams',
'org.apache.http.params.HttpParams',
'org.apache.http.params.HttpProtocolParams',
'org.apache.http.protocol.HttpContext',
'org.apache.http.protocol.HttpProcessor',
'org.apache.http.protocol.HttpRequestExecutor',

// commons-logging provided dependencies
'javax.servlet.ServletContextEvent',
'javax.servlet.ServletContextListener'
Expand Down
Loading