Skip to content

Commit

Permalink
deps: Update Guava to 32.0.1
Browse files Browse the repository at this point in the history 
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)
  • Loading branch information
@chadlwilson
chadlwilson committed Jun 20, 2023
1 parent 62d7b37 commit 40d5777
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 40 deletions.
4 changes: 2 additions & 2 deletions java/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.0-android</version>
<version>32.0.1-android</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
<version>32.0.0-android</version>
<version>32.0.1-android</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
72 changes: 36 additions & 36 deletions maven_install.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"dependency_tree": {
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": -739595740,
"__RESOLVED_ARTIFACTS_HASH": 611495085,
"__INPUT_ARTIFACTS_HASH": -1740498846,
"__RESOLVED_ARTIFACTS_HASH": -60988338,
"conflict_resolution": {
"com.google.errorprone:error_prone_annotations:2.5.1": "com.google.errorprone:error_prone_annotations:2.18.0"
},
Expand Down Expand Up @@ -69,11 +69,11 @@
{
"coord": "com.google.caliper:caliper-api:1.0-beta-3",
"dependencies": [
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"joda-time:joda-time:2.10.10"
],
"directDependencies": [
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"joda-time:joda-time:2.10.10"
],
"file": "v1/https/repo1.maven.org/maven2/com/google/caliper/caliper-api/1.0-beta-3/caliper-api-1.0-beta-3.jar",
Expand All @@ -92,7 +92,7 @@
"com.google.caliper:caliper-util:1.0-beta-3",
"com.google.code.gson:gson:2.8.9",
"com.google.dagger:dagger:2.22.1",
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"com.squareup.okhttp:okhttp:2.7.5",
"com.squareup.okio:okio:1.6.0",
"javax.inject:javax.inject:1",
Expand All @@ -103,7 +103,7 @@
"com.google.caliper:caliper-api:1.0-beta-3",
"com.google.caliper:caliper-util:1.0-beta-3",
"com.google.dagger:dagger:2.22.1",
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"com.squareup.okhttp:okhttp:2.7.5",
"joda-time:joda-time:2.10.10"
],
Expand All @@ -125,7 +125,7 @@
"com.google.code.gson:gson:2.8.9",
"com.google.dagger:dagger-producers:2.22.1",
"com.google.dagger:dagger:2.22.1",
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"com.squareup.okhttp:okhttp:2.7.5",
"com.squareup.okio:okio:1.6.0",
"javax.inject:javax.inject:1",
Expand All @@ -138,7 +138,7 @@
"com.google.caliper:caliper-util:1.0-beta-3",
"com.google.dagger:dagger-producers:2.22.1",
"com.google.dagger:dagger:2.22.1",
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"com.squareup.okhttp:okhttp:2.7.5",
"joda-time:joda-time:2.10.10"
],
Expand All @@ -155,14 +155,14 @@
"dependencies": [
"com.google.code.gson:gson:2.8.9",
"com.google.dagger:dagger:2.22.1",
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"javax.inject:javax.inject:1",
"joda-time:joda-time:2.10.10"
],
"directDependencies": [
"com.google.code.gson:gson:2.8.9",
"com.google.dagger:dagger:2.22.1",
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"joda-time:joda-time:2.10.10"
],
"file": "v1/https/repo1.maven.org/maven2/com/google/caliper/caliper-util/1.0-beta-3/caliper-util-1.0-beta-3.jar",
Expand All @@ -184,7 +184,7 @@
"com.google.code.gson:gson:2.8.9",
"com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0",
"com.google.dagger:dagger:2.22.1",
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"com.squareup.okhttp:okhttp:2.7.5",
"com.squareup.okio:okio:1.6.0",
"com.sun.jersey:jersey-client:1.19.4",
Expand All @@ -204,7 +204,7 @@
"com.google.caliper:caliper-worker:1.0-beta-3",
"com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0",
"com.google.dagger:dagger:2.22.1",
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"com.sun.jersey:jersey-client:1.19.4"
],
"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",
Expand All @@ -224,7 +224,7 @@
"com.google.caliper:caliper-util:1.0-beta-3",
"com.google.code.gson:gson:2.8.9",
"com.google.dagger:dagger:2.22.1",
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"com.squareup.okhttp:okhttp:2.7.5",
"com.squareup.okio:okio:1.6.0",
"javax.inject:javax.inject:1",
Expand All @@ -235,7 +235,7 @@
"com.google.caliper:caliper-core:1.0-beta-3",
"com.google.caliper:caliper-util:1.0-beta-3",
"com.google.dagger:dagger:2.22.1",
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"com.squareup.okhttp:okhttp:2.7.5",
"joda-time:joda-time:2.10.10"
],
Expand All @@ -261,7 +261,7 @@
"com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0",
"com.google.dagger:dagger-producers:2.22.1",
"com.google.dagger:dagger:2.22.1",
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"com.squareup.okhttp:okhttp:2.7.5",
"com.squareup.okio:okio:1.6.0",
"com.sun.jersey:jersey-client:1.19.4",
Expand All @@ -283,7 +283,7 @@
"com.google.caliper:caliper-worker-jvm:1.0-beta-3",
"com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0",
"com.google.dagger:dagger:2.22.1",
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"com.sun.jersey:jersey-client:1.19.4"
],
"file": "v1/https/repo1.maven.org/maven2/com/google/caliper/caliper/1.0-beta-3/caliper-1.0-beta-3.jar",
Expand Down Expand Up @@ -321,7 +321,7 @@
{
"coord": "com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0",
"dependencies": [
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"javax.annotation:javax.annotation-api:1.3.2",
"org.ow2.asm:asm-analysis:7.2",
"org.ow2.asm:asm-commons:7.2",
Expand All @@ -330,7 +330,7 @@
"org.ow2.asm:asm:9.0"
],
"directDependencies": [
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"javax.annotation:javax.annotation-api:1.3.2",
"org.ow2.asm:asm-analysis:7.2",
"org.ow2.asm:asm-commons:7.2",
Expand All @@ -350,13 +350,13 @@
"coord": "com.google.dagger:dagger-producers:2.22.1",
"dependencies": [
"com.google.dagger:dagger:2.22.1",
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"javax.inject:javax.inject:1",
"org.checkerframework:checker-compat-qual:2.5.3"
],
"directDependencies": [
"com.google.dagger:dagger:2.22.1",
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"javax.inject:javax.inject:1",
"org.checkerframework:checker-compat-qual:2.5.3"
],
Expand Down Expand Up @@ -409,12 +409,12 @@
"url": "https://repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar"
},
{
"coord": "com.google.guava:guava-testlib:32.0.0-jre",
"coord": "com.google.guava:guava-testlib:32.0.1-jre",
"dependencies": [
"com.google.code.findbugs:jsr305:3.0.2",
"com.google.errorprone:error_prone_annotations:2.18.0",
"com.google.guava:failureaccess:1.0.1",
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
"com.google.j2objc:j2objc-annotations:2.8",
"junit:junit:4.13.2",
Expand All @@ -424,21 +424,21 @@
"directDependencies": [
"com.google.code.findbugs:jsr305:3.0.2",
"com.google.errorprone:error_prone_annotations:2.18.0",
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"com.google.j2objc:j2objc-annotations:2.8",
"junit:junit:4.13.2",
"org.checkerframework:checker-qual:3.33.0"
],
"file": "v1/https/repo1.maven.org/maven2/com/google/guava/guava-testlib/32.0.0-jre/guava-testlib-32.0.0-jre.jar",
"file": "v1/https/repo1.maven.org/maven2/com/google/guava/guava-testlib/32.0.1-jre/guava-testlib-32.0.1-jre.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/com/google/guava/guava-testlib/32.0.0-jre/guava-testlib-32.0.0-jre.jar",
"https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/32.0.0-jre/guava-testlib-32.0.0-jre.jar"
"https://repo1.maven.org/maven2/com/google/guava/guava-testlib/32.0.1-jre/guava-testlib-32.0.1-jre.jar",
"https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/32.0.1-jre/guava-testlib-32.0.1-jre.jar"
],
"sha256": "8294e760db205405fdb916baa2eea615107b7b97c1810847dea33ea63fbaf3c8",
"url": "https://repo1.maven.org/maven2/com/google/guava/guava-testlib/32.0.0-jre/guava-testlib-32.0.0-jre.jar"
"sha256": "c97511849a5e085280f106df2b059566febd280b118d33d6a9e068d238100b63",
"url": "https://repo1.maven.org/maven2/com/google/guava/guava-testlib/32.0.1-jre/guava-testlib-32.0.1-jre.jar"
},
{
"coord": "com.google.guava:guava:32.0.0-jre",
"coord": "com.google.guava:guava:32.0.1-jre",
"dependencies": [
"com.google.code.findbugs:jsr305:3.0.2",
"com.google.errorprone:error_prone_annotations:2.18.0",
Expand All @@ -455,13 +455,13 @@
"com.google.j2objc:j2objc-annotations:2.8",
"org.checkerframework:checker-qual:3.33.0"
],
"file": "v1/https/repo1.maven.org/maven2/com/google/guava/guava/32.0.0-jre/guava-32.0.0-jre.jar",
"file": "v1/https/repo1.maven.org/maven2/com/google/guava/guava/32.0.1-jre/guava-32.0.1-jre.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/com/google/guava/guava/32.0.0-jre/guava-32.0.0-jre.jar",
"https://repo.maven.apache.org/maven2/com/google/guava/guava/32.0.0-jre/guava-32.0.0-jre.jar"
"https://repo1.maven.org/maven2/com/google/guava/guava/32.0.1-jre/guava-32.0.1-jre.jar",
"https://repo.maven.apache.org/maven2/com/google/guava/guava/32.0.1-jre/guava-32.0.1-jre.jar"
],
"sha256": "39f3550b0343d8d19dd4e83bd165b58ea3389d2ddb9f2148e63903f79ecdb114",
"url": "https://repo1.maven.org/maven2/com/google/guava/guava/32.0.0-jre/guava-32.0.0-jre.jar"
"sha256": "bd7fa227591fb8509677d0d1122cf95158f3b8a9f45653f58281d879f6dc48c5",
"url": "https://repo1.maven.org/maven2/com/google/guava/guava/32.0.1-jre/guava-32.0.1-jre.jar"
},
{
"coord": "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
Expand Down Expand Up @@ -492,15 +492,15 @@
"dependencies": [
"com.google.auto.value:auto-value-annotations:1.8.1",
"com.google.errorprone:error_prone_annotations:2.18.0",
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"junit:junit:4.13.2",
"org.checkerframework:checker-qual:3.33.0",
"org.ow2.asm:asm:9.0"
],
"directDependencies": [
"com.google.auto.value:auto-value-annotations:1.8.1",
"com.google.errorprone:error_prone_annotations:2.18.0",
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"junit:junit:4.13.2",
"org.checkerframework:checker-qual:3.33.0",
"org.ow2.asm:asm:9.0"
Expand Down
4 changes: 2 additions & 2 deletions protobuf_deps.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ PROTOBUF_MAVEN_ARTIFACTS = [
"com.google.code.gson:gson:2.8.9",
"com.google.errorprone:error_prone_annotations:2.5.1",
"com.google.j2objc:j2objc-annotations:2.8",
"com.google.guava:guava:32.0.0-jre",
"com.google.guava:guava-testlib:32.0.0-jre",
"com.google.guava:guava:32.0.1-jre",
"com.google.guava:guava-testlib:32.0.1-jre",
"com.google.truth:truth:1.1.2",
"junit:junit:4.13.2",
"org.mockito:mockito-core:4.3.1",
Expand Down

0 comments on commit 40d5777

Please sign in to comment.