Skip to content

Commit 40d5777

Browse files
chadlwilsonchadlwilson
committed
deps: Update Guava to 32.0.1
Follow-up from #12953 to update to `32.0.1` to fix an issue on windows: https://github.com/google/guava/releases/tag/v32.0.1 The underlying issue likely does not affect protobuf as it does not appear to (directly) use the affected `Files.createTempDir` or `FileBackedOutputStream` code which was apparently broken on Windows in `32.0.0`. Seems best to update anyway. (cherry picked from commit c95ebb7)
1 parent 62d7b37 commit 40d5777

File tree

3 files changed

+40
-40
lines changed

3 files changed

+40
-40
lines changed

‎java/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@
8787
<dependency>
8888
<groupId>com.google.guava</groupId>
8989
<artifactId>guava</artifactId>
90-
<version>32.0.0-android</version>
90+
<version>32.0.1-android</version>
9191
</dependency>
9292
<dependency>
9393
<groupId>com.google.guava</groupId>
9494
<artifactId>guava-testlib</artifactId>
95-
<version>32.0.0-android</version>
95+
<version>32.0.1-android</version>
9696
<scope>test</scope>
9797
</dependency>
9898
<dependency>

‎maven_install.json‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"dependency_tree": {
33
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
4-
"__INPUT_ARTIFACTS_HASH": -739595740,
5-
"__RESOLVED_ARTIFACTS_HASH": 611495085,
4+
"__INPUT_ARTIFACTS_HASH": -1740498846,
5+
"__RESOLVED_ARTIFACTS_HASH": -60988338,
66
"conflict_resolution": {
77
"com.google.errorprone:error_prone_annotations:2.5.1": "com.google.errorprone:error_prone_annotations:2.18.0"
88
},
@@ -69,11 +69,11 @@
6969
{
7070
"coord": "com.google.caliper:caliper-api:1.0-beta-3",
7171
"dependencies": [
72-
"com.google.guava:guava:32.0.0-jre",
72+
"com.google.guava:guava:32.0.1-jre",
7373
"joda-time:joda-time:2.10.10"
7474
],
7575
"directDependencies": [
76-
"com.google.guava:guava:32.0.0-jre",
76+
"com.google.guava:guava:32.0.1-jre",
7777
"joda-time:joda-time:2.10.10"
7878
],
7979
"file": "v1/https/repo1.maven.org/maven2/com/google/caliper/caliper-api/1.0-beta-3/caliper-api-1.0-beta-3.jar",
@@ -92,7 +92,7 @@
9292
"com.google.caliper:caliper-util:1.0-beta-3",
9393
"com.google.code.gson:gson:2.8.9",
9494
"com.google.dagger:dagger:2.22.1",
95-
"com.google.guava:guava:32.0.0-jre",
95+
"com.google.guava:guava:32.0.1-jre",
9696
"com.squareup.okhttp:okhttp:2.7.5",
9797
"com.squareup.okio:okio:1.6.0",
9898
"javax.inject:javax.inject:1",
@@ -103,7 +103,7 @@
103103
"com.google.caliper:caliper-api:1.0-beta-3",
104104
"com.google.caliper:caliper-util:1.0-beta-3",
105105
"com.google.dagger:dagger:2.22.1",
106-
"com.google.guava:guava:32.0.0-jre",
106+
"com.google.guava:guava:32.0.1-jre",
107107
"com.squareup.okhttp:okhttp:2.7.5",
108108
"joda-time:joda-time:2.10.10"
109109
],
@@ -125,7 +125,7 @@
125125
"com.google.code.gson:gson:2.8.9",
126126
"com.google.dagger:dagger-producers:2.22.1",
127127
"com.google.dagger:dagger:2.22.1",
128-
"com.google.guava:guava:32.0.0-jre",
128+
"com.google.guava:guava:32.0.1-jre",
129129
"com.squareup.okhttp:okhttp:2.7.5",
130130
"com.squareup.okio:okio:1.6.0",
131131
"javax.inject:javax.inject:1",
@@ -138,7 +138,7 @@
138138
"com.google.caliper:caliper-util:1.0-beta-3",
139139
"com.google.dagger:dagger-producers:2.22.1",
140140
"com.google.dagger:dagger:2.22.1",
141-
"com.google.guava:guava:32.0.0-jre",
141+
"com.google.guava:guava:32.0.1-jre",
142142
"com.squareup.okhttp:okhttp:2.7.5",
143143
"joda-time:joda-time:2.10.10"
144144
],
@@ -155,14 +155,14 @@
155155
"dependencies": [
156156
"com.google.code.gson:gson:2.8.9",
157157
"com.google.dagger:dagger:2.22.1",
158-
"com.google.guava:guava:32.0.0-jre",
158+
"com.google.guava:guava:32.0.1-jre",
159159
"javax.inject:javax.inject:1",
160160
"joda-time:joda-time:2.10.10"
161161
],
162162
"directDependencies": [
163163
"com.google.code.gson:gson:2.8.9",
164164
"com.google.dagger:dagger:2.22.1",
165-
"com.google.guava:guava:32.0.0-jre",
165+
"com.google.guava:guava:32.0.1-jre",
166166
"joda-time:joda-time:2.10.10"
167167
],
168168
"file": "v1/https/repo1.maven.org/maven2/com/google/caliper/caliper-util/1.0-beta-3/caliper-util-1.0-beta-3.jar",
@@ -184,7 +184,7 @@
184184
"com.google.code.gson:gson:2.8.9",
185185
"com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0",
186186
"com.google.dagger:dagger:2.22.1",
187-
"com.google.guava:guava:32.0.0-jre",
187+
"com.google.guava:guava:32.0.1-jre",
188188
"com.squareup.okhttp:okhttp:2.7.5",
189189
"com.squareup.okio:okio:1.6.0",
190190
"com.sun.jersey:jersey-client:1.19.4",
@@ -204,7 +204,7 @@
204204
"com.google.caliper:caliper-worker:1.0-beta-3",
205205
"com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0",
206206
"com.google.dagger:dagger:2.22.1",
207-
"com.google.guava:guava:32.0.0-jre",
207+
"com.google.guava:guava:32.0.1-jre",
208208
"com.sun.jersey:jersey-client:1.19.4"
209209
],
210210
"file": "v1/https/repo1.maven.org/maven2/com/google/caliper/caliper-worker-jvm/1.0-beta-3/caliper-worker-jvm-1.0-beta-3.jar",
@@ -224,7 +224,7 @@
224224
"com.google.caliper:caliper-util:1.0-beta-3",
225225
"com.google.code.gson:gson:2.8.9",
226226
"com.google.dagger:dagger:2.22.1",
227-
"com.google.guava:guava:32.0.0-jre",
227+
"com.google.guava:guava:32.0.1-jre",
228228
"com.squareup.okhttp:okhttp:2.7.5",
229229
"com.squareup.okio:okio:1.6.0",
230230
"javax.inject:javax.inject:1",
@@ -235,7 +235,7 @@
235235
"com.google.caliper:caliper-core:1.0-beta-3",
236236
"com.google.caliper:caliper-util:1.0-beta-3",
237237
"com.google.dagger:dagger:2.22.1",
238-
"com.google.guava:guava:32.0.0-jre",
238+
"com.google.guava:guava:32.0.1-jre",
239239
"com.squareup.okhttp:okhttp:2.7.5",
240240
"joda-time:joda-time:2.10.10"
241241
],
@@ -261,7 +261,7 @@
261261
"com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0",
262262
"com.google.dagger:dagger-producers:2.22.1",
263263
"com.google.dagger:dagger:2.22.1",
264-
"com.google.guava:guava:32.0.0-jre",
264+
"com.google.guava:guava:32.0.1-jre",
265265
"com.squareup.okhttp:okhttp:2.7.5",
266266
"com.squareup.okio:okio:1.6.0",
267267
"com.sun.jersey:jersey-client:1.19.4",
@@ -283,7 +283,7 @@
283283
"com.google.caliper:caliper-worker-jvm:1.0-beta-3",
284284
"com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0",
285285
"com.google.dagger:dagger:2.22.1",
286-
"com.google.guava:guava:32.0.0-jre",
286+
"com.google.guava:guava:32.0.1-jre",
287287
"com.sun.jersey:jersey-client:1.19.4"
288288
],
289289
"file": "v1/https/repo1.maven.org/maven2/com/google/caliper/caliper/1.0-beta-3/caliper-1.0-beta-3.jar",
@@ -321,7 +321,7 @@
321321
{
322322
"coord": "com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0",
323323
"dependencies": [
324-
"com.google.guava:guava:32.0.0-jre",
324+
"com.google.guava:guava:32.0.1-jre",
325325
"javax.annotation:javax.annotation-api:1.3.2",
326326
"org.ow2.asm:asm-analysis:7.2",
327327
"org.ow2.asm:asm-commons:7.2",
@@ -330,7 +330,7 @@
330330
"org.ow2.asm:asm:9.0"
331331
],
332332
"directDependencies": [
333-
"com.google.guava:guava:32.0.0-jre",
333+
"com.google.guava:guava:32.0.1-jre",
334334
"javax.annotation:javax.annotation-api:1.3.2",
335335
"org.ow2.asm:asm-analysis:7.2",
336336
"org.ow2.asm:asm-commons:7.2",
@@ -350,13 +350,13 @@
350350
"coord": "com.google.dagger:dagger-producers:2.22.1",
351351
"dependencies": [
352352
"com.google.dagger:dagger:2.22.1",
353-
"com.google.guava:guava:32.0.0-jre",
353+
"com.google.guava:guava:32.0.1-jre",
354354
"javax.inject:javax.inject:1",
355355
"org.checkerframework:checker-compat-qual:2.5.3"
356356
],
357357
"directDependencies": [
358358
"com.google.dagger:dagger:2.22.1",
359-
"com.google.guava:guava:32.0.0-jre",
359+
"com.google.guava:guava:32.0.1-jre",
360360
"javax.inject:javax.inject:1",
361361
"org.checkerframework:checker-compat-qual:2.5.3"
362362
],
@@ -409,12 +409,12 @@
409409
"url": "https://repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar"
410410
},
411411
{
412-
"coord": "com.google.guava:guava-testlib:32.0.0-jre",
412+
"coord": "com.google.guava:guava-testlib:32.0.1-jre",
413413
"dependencies": [
414414
"com.google.code.findbugs:jsr305:3.0.2",
415415
"com.google.errorprone:error_prone_annotations:2.18.0",
416416
"com.google.guava:failureaccess:1.0.1",
417-
"com.google.guava:guava:32.0.0-jre",
417+
"com.google.guava:guava:32.0.1-jre",
418418
"com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
419419
"com.google.j2objc:j2objc-annotations:2.8",
420420
"junit:junit:4.13.2",
@@ -424,21 +424,21 @@
424424
"directDependencies": [
425425
"com.google.code.findbugs:jsr305:3.0.2",
426426
"com.google.errorprone:error_prone_annotations:2.18.0",
427-
"com.google.guava:guava:32.0.0-jre",
427+
"com.google.guava:guava:32.0.1-jre",
428428
"com.google.j2objc:j2objc-annotations:2.8",
429429
"junit:junit:4.13.2",
430430
"org.checkerframework:checker-qual:3.33.0"
431431
],
432-
"file": "v1/https/repo1.maven.org/maven2/com/google/guava/guava-testlib/32.0.0-jre/guava-testlib-32.0.0-jre.jar",
432+
"file": "v1/https/repo1.maven.org/maven2/com/google/guava/guava-testlib/32.0.1-jre/guava-testlib-32.0.1-jre.jar",
433433
"mirror_urls": [
434-
"https://repo1.maven.org/maven2/com/google/guava/guava-testlib/32.0.0-jre/guava-testlib-32.0.0-jre.jar",
435-
"https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/32.0.0-jre/guava-testlib-32.0.0-jre.jar"
434+
"https://repo1.maven.org/maven2/com/google/guava/guava-testlib/32.0.1-jre/guava-testlib-32.0.1-jre.jar",
435+
"https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/32.0.1-jre/guava-testlib-32.0.1-jre.jar"
436436
],
437-
"sha256": "8294e760db205405fdb916baa2eea615107b7b97c1810847dea33ea63fbaf3c8",
438-
"url": "https://repo1.maven.org/maven2/com/google/guava/guava-testlib/32.0.0-jre/guava-testlib-32.0.0-jre.jar"
437+
"sha256": "c97511849a5e085280f106df2b059566febd280b118d33d6a9e068d238100b63",
438+
"url": "https://repo1.maven.org/maven2/com/google/guava/guava-testlib/32.0.1-jre/guava-testlib-32.0.1-jre.jar"
439439
},
440440
{
441-
"coord": "com.google.guava:guava:32.0.0-jre",
441+
"coord": "com.google.guava:guava:32.0.1-jre",
442442
"dependencies": [
443443
"com.google.code.findbugs:jsr305:3.0.2",
444444
"com.google.errorprone:error_prone_annotations:2.18.0",
@@ -455,13 +455,13 @@
455455
"com.google.j2objc:j2objc-annotations:2.8",
456456
"org.checkerframework:checker-qual:3.33.0"
457457
],
458-
"file": "v1/https/repo1.maven.org/maven2/com/google/guava/guava/32.0.0-jre/guava-32.0.0-jre.jar",
458+
"file": "v1/https/repo1.maven.org/maven2/com/google/guava/guava/32.0.1-jre/guava-32.0.1-jre.jar",
459459
"mirror_urls": [
460-
"https://repo1.maven.org/maven2/com/google/guava/guava/32.0.0-jre/guava-32.0.0-jre.jar",
461-
"https://repo.maven.apache.org/maven2/com/google/guava/guava/32.0.0-jre/guava-32.0.0-jre.jar"
460+
"https://repo1.maven.org/maven2/com/google/guava/guava/32.0.1-jre/guava-32.0.1-jre.jar",
461+
"https://repo.maven.apache.org/maven2/com/google/guava/guava/32.0.1-jre/guava-32.0.1-jre.jar"
462462
],
463-
"sha256": "39f3550b0343d8d19dd4e83bd165b58ea3389d2ddb9f2148e63903f79ecdb114",
464-
"url": "https://repo1.maven.org/maven2/com/google/guava/guava/32.0.0-jre/guava-32.0.0-jre.jar"
463+
"sha256": "bd7fa227591fb8509677d0d1122cf95158f3b8a9f45653f58281d879f6dc48c5",
464+
"url": "https://repo1.maven.org/maven2/com/google/guava/guava/32.0.1-jre/guava-32.0.1-jre.jar"
465465
},
466466
{
467467
"coord": "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
@@ -492,15 +492,15 @@
492492
"dependencies": [
493493
"com.google.auto.value:auto-value-annotations:1.8.1",
494494
"com.google.errorprone:error_prone_annotations:2.18.0",
495-
"com.google.guava:guava:32.0.0-jre",
495+
"com.google.guava:guava:32.0.1-jre",
496496
"junit:junit:4.13.2",
497497
"org.checkerframework:checker-qual:3.33.0",
498498
"org.ow2.asm:asm:9.0"
499499
],
500500
"directDependencies": [
501501
"com.google.auto.value:auto-value-annotations:1.8.1",
502502
"com.google.errorprone:error_prone_annotations:2.18.0",
503-
"com.google.guava:guava:32.0.0-jre",
503+
"com.google.guava:guava:32.0.1-jre",
504504
"junit:junit:4.13.2",
505505
"org.checkerframework:checker-qual:3.33.0",
506506
"org.ow2.asm:asm:9.0"

‎protobuf_deps.bzl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ PROTOBUF_MAVEN_ARTIFACTS = [
88
"com.google.code.gson:gson:2.8.9",
99
"com.google.errorprone:error_prone_annotations:2.5.1",
1010
"com.google.j2objc:j2objc-annotations:2.8",
11-
"com.google.guava:guava:32.0.0-jre",
12-
"com.google.guava:guava-testlib:32.0.0-jre",
11+
"com.google.guava:guava:32.0.1-jre",
12+
"com.google.guava:guava-testlib:32.0.1-jre",
1313
"com.google.truth:truth:1.1.2",
1414
"junit:junit:4.13.2",
1515
"org.mockito:mockito-core:4.3.1",

0 commit comments

Comments
 (0)