Skip to content

Commit 93af646

Browse files
jakelandisjakelandis
authored
[7.x] Sync discovery_gce versions with main (#104086)
This commit syncs the dependencies for discovery GCE plugin with the dependency versions in use in main. Specifically, this commit upgrades the following for the discovery GCE plugin: com.google.apis:google-api-services-compute:v1-rev160-1.23.0 -> v1-rev20220322-1.32 com.google.api-client:google-api-client:1.23.0 -> 1.33.1 com.google.oauth-client:google-oauth-client:1.23.0 -> 1.34.1 com.google.code.findbugs:jsr305:1.3.9 -> 3.0.2 and introduces the following for the discovery GCE plugin: api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}" api "com.google.http-client:google-http-client-gson:1.41.1" runtimeOnly 'com.google.guava:guava:32.0.1-jre' runtimeOnly 'com.google.guava:failureaccess:1.0.1' api 'io.opencensus:opencensus-api:0.30.0' api 'io.opencensus:opencensus-contrib-http-util:0.30.0' api 'io.grpc:grpc-context:1.27.2' backport of #85132 and #91722
1 parent a586ac7 commit 93af646

11 files changed

+901
-9
lines changed

‎docs/changelog/104086.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 104086
2+
summary: "[7.x] Sync `discovery_gce` versions with main"
3+
area: Discovery-Plugins
4+
type: upgrade
5+
issues: []

‎gradle/verification-metadata.xml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,11 @@
464464
<sha256 value="357de0017d439c021a6a98d48e380a25a709dc9bc50e4b38c6ab84094e6f2e84" origin="Generated by Gradle"/>
465465
</artifact>
466466
</component>
467+
<component group="com.google.api-client" name="google-api-client" version="1.33.1">
468+
<artifact name="google-api-client-1.33.1.jar">
469+
<sha256 value="d471ac82f1b285b3fde1e5b7ff265dad7ab9cd73a052bcb01ef35054f7d5db02" origin="Generated by Gradle"/>
470+
</artifact>
471+
</component>
467472
<component group="com.google.api-client" name="google-api-client" version="1.35.1">
468473
<artifact name="google-api-client-1.35.1.jar">
469474
<sha256 value="24714add0c0248730a0e705448bbc91a5c68dbc0dc9f7fa0c97366bc7b275e23" origin="Generated by Gradle"/>
@@ -499,6 +504,11 @@
499504
<sha256 value="135f7053fc6eae0fadf587a110254d4f325dd46f3089d120492b599900ab857f" origin="Generated by Gradle"/>
500505
</artifact>
501506
</component>
507+
<component group="com.google.apis" name="google-api-services-compute" version="v1-rev20220322-1.32.1">
508+
<artifact name="google-api-services-compute-v1-rev20220322-1.32.1.jar">
509+
<sha256 value="05d913bb9b2baa8e4dfd99a1aee4864240feebf6647986e37aea88f3020313fe" origin="Generated by Gradle"/>
510+
</artifact>
511+
</component>
502512
<component group="com.google.apis" name="google-api-services-storage" version="v1-rev20210127-1.32.1">
503513
<artifact name="google-api-services-storage-v1-rev20210127-1.32.1.jar">
504514
<sha256 value="c23beb05bb842abed14c8fd75a3e6b7a2f51b0d3ece1903a9c5fd3ab770ad93e" origin="Generated by Gradle"/>
@@ -699,6 +709,11 @@
699709
<sha256 value="6ab4967860927f051dd7f2b575e4b7a8ef35f367dc2e3408073aa4dee328e227" origin="Generated by Gradle"/>
700710
</artifact>
701711
</component>
712+
<component group="com.google.http-client" name="google-http-client" version="1.41.1">
713+
<artifact name="google-http-client-1.41.1.jar">
714+
<sha256 value="93bf43e033c7441f66f163f2cb1244d89765c492b844031258ae92b7081dde6e" origin="Generated by Gradle"/>
715+
</artifact>
716+
</component>
702717
<component group="com.google.http-client" name="google-http-client" version="1.42.3">
703718
<artifact name="google-http-client-1.42.3.jar">
704719
<sha256 value="e395dd1765e3e6bceb0c610706bcf4128de84bd6e65cf1d4adbf998b4114161c" origin="Generated by Gradle"/>
@@ -719,6 +734,11 @@
719734
<sha256 value="cf81944fd41fe0daa869b913bd0aaaef0e4d8fe6774a195540f454ecd3cf50b6" origin="Generated by Gradle"/>
720735
</artifact>
721736
</component>
737+
<component group="com.google.http-client" name="google-http-client-gson" version="1.41.1">
738+
<artifact name="google-http-client-gson-1.41.1.jar">
739+
<sha256 value="29deba06c722e00dd31fe7e3b526bdfec0577660b868a1efaceeddb5e04208a8" origin="Generated by Gradle"/>
740+
</artifact>
741+
</component>
722742
<component group="com.google.http-client" name="google-http-client-gson" version="1.42.3">
723743
<artifact name="google-http-client-gson-1.42.3.jar">
724744
<sha256 value="8196efaa89c5f73b00b2b48edad02fcd78524259407c37ab1860737988545cee" origin="Generated by Gradle"/>
@@ -734,6 +754,11 @@
734754
<sha256 value="74a493a7ba25e1dfb3d3a4ddf713306d5a3786db00a3489d59061dc8cff321b1" origin="Generated by Gradle"/>
735755
</artifact>
736756
</component>
757+
<component group="com.google.http-client" name="google-http-client-jackson2" version="1.41.1">
758+
<artifact name="google-http-client-jackson2-1.41.1.jar">
759+
<sha256 value="3b9add5859979519236f45cc9c9f53da975e0b5b88e0cdfd4bb009b112b4d435" origin="Generated by Gradle"/>
760+
</artifact>
761+
</component>
737762
<component group="com.google.http-client" name="google-http-client-jackson2" version="1.42.3">
738763
<artifact name="google-http-client-jackson2-1.42.3.jar">
739764
<sha256 value="b03a79f38e924e2eeaee673acf314626825284cb39948d06c2948ad083b4d089" origin="Generated by Gradle"/>
@@ -1349,6 +1374,11 @@
13491374
<sha256 value="b86d65b345966d3a8e6bd35b1b7ae557c75cff6787fec1bc5837a9a3be61212e" origin="Generated by Gradle"/>
13501375
</artifact>
13511376
</component>
1377+
<component group="io.grpc" name="grpc-context" version="1.27.2">
1378+
<artifact name="grpc-context-1.27.2.jar">
1379+
<sha256 value="bcbf9055dff453fd6508bd7cca2a0aa2d5f059a9c94beed1f5fda1dc015607b8" origin="Generated by Gradle"/>
1380+
</artifact>
1381+
</component>
13521382
<component group="io.grpc" name="grpc-context" version="1.39.0">
13531383
<artifact name="grpc-context-1.39.0.jar">
13541384
<sha256 value="97fe70b4e7da86ed4fe3deb16d83fc89c7e5b764ebac8c9dd5d51dd4b5aa920c" origin="Generated by Gradle"/>
@@ -1579,6 +1609,11 @@
15791609
<sha256 value="0c1723f3f6d3061323845ce8b88b35fdda500812e0a75b8eb5fcc4ad8c871a95" origin="Generated by Gradle"/>
15801610
</artifact>
15811611
</component>
1612+
<component group="io.opencensus" name="opencensus-api" version="0.30.0">
1613+
<artifact name="opencensus-api-0.30.0.jar">
1614+
<sha256 value="421cbc06d9fb56fcf07332553677ddea04a47079b30955567c8a80b34689ed32" origin="Generated by Gradle"/>
1615+
</artifact>
1616+
</component>
15821617
<component group="io.opencensus" name="opencensus-api" version="0.31.1">
15831618
<artifact name="opencensus-api-0.31.1.jar">
15841619
<sha256 value="f1474d47f4b6b001558ad27b952e35eda5cc7146788877fc52938c6eba24b382" origin="Generated by Gradle"/>
@@ -1589,6 +1624,11 @@
15891624
<sha256 value="49c3db2a29f1fdb2f73928cbea969bd1d40fab7cc5bb6273022babd96f7a789b" origin="Generated by Gradle"/>
15901625
</artifact>
15911626
</component>
1627+
<component group="io.opencensus" name="opencensus-contrib-http-util" version="0.30.0">
1628+
<artifact name="opencensus-contrib-http-util-0.30.0.jar">
1629+
<sha256 value="5432d2e9a1bdc8a0e835c6bce52b9d767fbf688cc8892432cff97c3389894b46" origin="Generated by Gradle"/>
1630+
</artifact>
1631+
</component>
15921632
<component group="io.opencensus" name="opencensus-contrib-http-util" version="0.31.1">
15931633
<artifact name="opencensus-contrib-http-util-0.31.1.jar">
15941634
<sha256 value="3ea995b55a4068be22989b70cc29a4d788c2d328d1d50613a7a9afd13fdd2d0a" origin="Generated by Gradle"/>

‎plugins/discovery-gce/build.gradle‎

Lines changed: 48 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,30 @@ esplugin {
77
}
88

99
versions << [
10-
'google': '1.23.0'
10+
'google' : '1.41.1',
11+
'google_api_client' : '1.33.1',
12+
'api_services_compute': 'v1-rev20220322-1.32.1',
13+
'google_oauth_client' : '1.34.1'
1114
]
1215

1316
dependencies {
14-
api "com.google.apis:google-api-services-compute:v1-rev160-${versions.google}"
15-
api "com.google.api-client:google-api-client:${versions.google}"
16-
api "com.google.oauth-client:google-oauth-client:${versions.google}"
17+
api "com.google.apis:google-api-services-compute:${versions.api_services_compute}"
18+
api "com.google.api-client:google-api-client:${versions.google_api_client}"
19+
api "com.google.oauth-client:google-oauth-client:${versions.google_oauth_client}"
1720
api "com.google.http-client:google-http-client:${versions.google}"
1821
api "com.google.http-client:google-http-client-jackson2:${versions.google}"
19-
api 'com.google.code.findbugs:jsr305:1.3.9'
22+
api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
23+
api "com.google.http-client:google-http-client-gson:${versions.google}"
24+
api 'com.google.code.findbugs:jsr305:3.0.2'
2025
api "commons-logging:commons-logging:${versions.commonslogging}"
2126
api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
2227
api "commons-codec:commons-codec:${versions.commonscodec}"
28+
29+
runtimeOnly 'com.google.guava:guava:32.0.1-jre'
30+
runtimeOnly 'com.google.guava:failureaccess:1.0.1'
31+
api 'io.opencensus:opencensus-api:0.30.0'
32+
api 'io.opencensus:opencensus-contrib-http-util:0.30.0'
33+
api 'io.grpc:grpc-context:1.27.2'
2334
}
2435

2536
restResources {
@@ -29,7 +40,9 @@ restResources {
2940
}
3041

3142
tasks.named("dependencyLicenses").configure {
43+
mapping from: /opencensus.*/, to: 'opencensus'
3244
mapping from: /google-.*/, to: 'google'
45+
mapping from: /jackson-.*/, to: 'jackson'
3346
}
3447

3548
tasks.named("check").configure {
@@ -45,14 +58,13 @@ tasks.named("test").configure {
4558
tasks.named("thirdPartyAudit").configure {
4659
ignoreMissingClasses(
4760
// classes are missing
48-
'com.google.common.base.Splitter',
49-
'com.google.common.collect.Lists',
50-
'javax.jms.Message',
5161
'javax.servlet.ServletContextEvent',
5262
'javax.servlet.ServletContextListener',
5363
'org.apache.avalon.framework.logger.Logger',
5464
'org.apache.log.Hierarchy',
5565
'org.apache.log.Logger',
66+
'org.apache.avalon.framework.logger.Logger',
67+
'javax.jms.Message',
5668
'org.apache.http.ConnectionReuseStrategy',
5769
'org.apache.http.Header',
5870
'org.apache.http.HttpEntity',
@@ -71,22 +83,49 @@ tasks.named("thirdPartyAudit").configure {
7183
'org.apache.http.client.UserTokenHandler',
7284
'org.apache.http.client.methods.HttpEntityEnclosingRequestBase',
7385
'org.apache.http.client.methods.HttpRequestBase',
86+
'org.apache.http.config.Registry',
87+
'org.apache.http.config.RegistryBuilder',
88+
'org.apache.http.config.SocketConfig',
89+
'org.apache.http.config.SocketConfig$Builder',
7490
'org.apache.http.conn.ClientConnectionManager',
7591
'org.apache.http.conn.ConnectionKeepAliveStrategy',
7692
'org.apache.http.conn.params.ConnManagerParams',
7793
'org.apache.http.conn.params.ConnRouteParams',
7894
'org.apache.http.conn.routing.HttpRoutePlanner',
7995
'org.apache.http.conn.scheme.PlainSocketFactory',
8096
'org.apache.http.conn.scheme.SchemeRegistry',
97+
'org.apache.http.conn.socket.PlainConnectionSocketFactory',
8198
'org.apache.http.conn.ssl.SSLSocketFactory',
8299
'org.apache.http.conn.ssl.X509HostnameVerifier',
83100
'org.apache.http.entity.AbstractHttpEntity',
84101
'org.apache.http.impl.client.DefaultHttpClient',
102+
'org.apache.http.impl.client.HttpClientBuilder',
103+
'org.apache.http.impl.conn.PoolingHttpClientConnectionManager',
85104
'org.apache.http.params.HttpConnectionParams',
86105
'org.apache.http.params.HttpParams',
87106
'org.apache.http.params.HttpProtocolParams',
88107
'org.apache.http.protocol.HttpContext',
89108
'org.apache.http.protocol.HttpProcessor',
90-
'org.apache.http.protocol.HttpRequestExecutor'
109+
'org.apache.http.protocol.HttpRequestExecutor',
110+
'com.google.api.client.http.apache.v2.ApacheHttpTransport',
111+
'com.google.gson.stream.JsonReader',
112+
'com.google.gson.stream.JsonToken',
113+
'com.google.gson.stream.JsonWriter'
114+
)
115+
116+
ignoreViolations(
117+
'com.google.common.cache.Striped64',
118+
'com.google.common.cache.Striped64$1',
119+
'com.google.common.cache.Striped64$Cell',
120+
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray',
121+
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$1',
122+
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$2',
123+
'com.google.common.hash.Striped64',
124+
'com.google.common.hash.Striped64$1',
125+
'com.google.common.hash.Striped64$Cell',
126+
'com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator',
127+
'com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator$1',
128+
'com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper',
129+
'com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper$1'
91130
)
92131
}

0 commit comments

Comments
 (0)