diff --git a/java/pom.xml b/java/pom.xml
index 9e4e07bf47f7..9a4f67698234 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -87,12 +87,12 @@
com.google.guava
guava
- 31.1-android
+ 32.0.0-android
com.google.guava
guava-testlib
- 31.1-android
+ 32.0.0-android
test
diff --git a/java/util/pom.xml b/java/util/pom.xml
index b3af138082b3..189f3f6265e1 100644
--- a/java/util/pom.xml
+++ b/java/util/pom.xml
@@ -30,7 +30,7 @@
com.google.j2objc
j2objc-annotations
- 1.3
+ 2.8
com.google.code.findbugs
diff --git a/maven_install.json b/maven_install.json
index 7d033cef67c7..587c2ae0fd95 100644
--- a/maven_install.json
+++ b/maven_install.json
@@ -1,10 +1,10 @@
{
"dependency_tree": {
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
- "__INPUT_ARTIFACTS_HASH": 867318050,
- "__RESOLVED_ARTIFACTS_HASH": -2034614194,
+ "__INPUT_ARTIFACTS_HASH": -739595740,
+ "__RESOLVED_ARTIFACTS_HASH": 611495085,
"conflict_resolution": {
- "com.google.errorprone:error_prone_annotations:2.5.1": "com.google.errorprone:error_prone_annotations:2.11.0"
+ "com.google.errorprone:error_prone_annotations:2.5.1": "com.google.errorprone:error_prone_annotations:2.18.0"
},
"dependencies": [
{
@@ -69,11 +69,11 @@
{
"coord": "com.google.caliper:caliper-api:1.0-beta-3",
"dependencies": [
- "com.google.guava:guava:31.1-jre",
+ "com.google.guava:guava:32.0.0-jre",
"joda-time:joda-time:2.10.10"
],
"directDependencies": [
- "com.google.guava:guava:31.1-jre",
+ "com.google.guava:guava:32.0.0-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",
@@ -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:31.1-jre",
+ "com.google.guava:guava:32.0.0-jre",
"com.squareup.okhttp:okhttp:2.7.5",
"com.squareup.okio:okio:1.6.0",
"javax.inject:javax.inject:1",
@@ -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:31.1-jre",
+ "com.google.guava:guava:32.0.0-jre",
"com.squareup.okhttp:okhttp:2.7.5",
"joda-time:joda-time:2.10.10"
],
@@ -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:31.1-jre",
+ "com.google.guava:guava:32.0.0-jre",
"com.squareup.okhttp:okhttp:2.7.5",
"com.squareup.okio:okio:1.6.0",
"javax.inject:javax.inject:1",
@@ -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:31.1-jre",
+ "com.google.guava:guava:32.0.0-jre",
"com.squareup.okhttp:okhttp:2.7.5",
"joda-time:joda-time:2.10.10"
],
@@ -155,14 +155,14 @@
"dependencies": [
"com.google.code.gson:gson:2.8.9",
"com.google.dagger:dagger:2.22.1",
- "com.google.guava:guava:31.1-jre",
+ "com.google.guava:guava:32.0.0-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:31.1-jre",
+ "com.google.guava:guava:32.0.0-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",
@@ -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:31.1-jre",
+ "com.google.guava:guava:32.0.0-jre",
"com.squareup.okhttp:okhttp:2.7.5",
"com.squareup.okio:okio:1.6.0",
"com.sun.jersey:jersey-client:1.19.4",
@@ -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:31.1-jre",
+ "com.google.guava:guava:32.0.0-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",
@@ -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:31.1-jre",
+ "com.google.guava:guava:32.0.0-jre",
"com.squareup.okhttp:okhttp:2.7.5",
"com.squareup.okio:okio:1.6.0",
"javax.inject:javax.inject:1",
@@ -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:31.1-jre",
+ "com.google.guava:guava:32.0.0-jre",
"com.squareup.okhttp:okhttp:2.7.5",
"joda-time:joda-time:2.10.10"
],
@@ -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:31.1-jre",
+ "com.google.guava:guava:32.0.0-jre",
"com.squareup.okhttp:okhttp:2.7.5",
"com.squareup.okio:okio:1.6.0",
"com.sun.jersey:jersey-client:1.19.4",
@@ -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:31.1-jre",
+ "com.google.guava:guava:32.0.0-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",
@@ -321,7 +321,7 @@
{
"coord": "com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0",
"dependencies": [
- "com.google.guava:guava:31.1-jre",
+ "com.google.guava:guava:32.0.0-jre",
"javax.annotation:javax.annotation-api:1.3.2",
"org.ow2.asm:asm-analysis:7.2",
"org.ow2.asm:asm-commons:7.2",
@@ -330,7 +330,7 @@
"org.ow2.asm:asm:9.0"
],
"directDependencies": [
- "com.google.guava:guava:31.1-jre",
+ "com.google.guava:guava:32.0.0-jre",
"javax.annotation:javax.annotation-api:1.3.2",
"org.ow2.asm:asm-analysis:7.2",
"org.ow2.asm:asm-commons:7.2",
@@ -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:31.1-jre",
+ "com.google.guava:guava:32.0.0-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:31.1-jre",
+ "com.google.guava:guava:32.0.0-jre",
"javax.inject:javax.inject:1",
"org.checkerframework:checker-compat-qual:2.5.3"
],
@@ -385,16 +385,16 @@
"url": "https://repo1.maven.org/maven2/com/google/dagger/dagger/2.22.1/dagger-2.22.1.jar"
},
{
- "coord": "com.google.errorprone:error_prone_annotations:2.11.0",
+ "coord": "com.google.errorprone:error_prone_annotations:2.18.0",
"dependencies": [],
"directDependencies": [],
- "file": "v1/https/repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.jar",
+ "file": "v1/https/repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.18.0/error_prone_annotations-2.18.0.jar",
"mirror_urls": [
- "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.jar",
- "https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.jar"
+ "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.18.0/error_prone_annotations-2.18.0.jar",
+ "https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.18.0/error_prone_annotations-2.18.0.jar"
],
- "sha256": "721cb91842b46fa056847d104d5225c8b8e1e8b62263b993051e1e5a0137b7ec",
- "url": "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.jar"
+ "sha256": "9e6814cb71816988a4fd1b07a993a8f21bb7058d522c162b1de849e19bea54ae",
+ "url": "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.18.0/error_prone_annotations-2.18.0.jar"
},
{
"coord": "com.google.guava:failureaccess:1.0.1",
@@ -409,59 +409,59 @@
"url": "https://repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar"
},
{
- "coord": "com.google.guava:guava-testlib:31.1-jre",
+ "coord": "com.google.guava:guava-testlib:32.0.0-jre",
"dependencies": [
"com.google.code.findbugs:jsr305:3.0.2",
- "com.google.errorprone:error_prone_annotations:2.11.0",
+ "com.google.errorprone:error_prone_annotations:2.18.0",
"com.google.guava:failureaccess:1.0.1",
- "com.google.guava:guava:31.1-jre",
+ "com.google.guava:guava:32.0.0-jre",
"com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
- "com.google.j2objc:j2objc-annotations:1.3",
+ "com.google.j2objc:j2objc-annotations:2.8",
"junit:junit:4.13.2",
- "org.checkerframework:checker-qual:3.12.0",
+ "org.checkerframework:checker-qual:3.33.0",
"org.hamcrest:hamcrest-core:1.3"
],
"directDependencies": [
"com.google.code.findbugs:jsr305:3.0.2",
- "com.google.errorprone:error_prone_annotations:2.11.0",
- "com.google.guava:guava:31.1-jre",
- "com.google.j2objc:j2objc-annotations:1.3",
+ "com.google.errorprone:error_prone_annotations:2.18.0",
+ "com.google.guava:guava:32.0.0-jre",
+ "com.google.j2objc:j2objc-annotations:2.8",
"junit:junit:4.13.2",
- "org.checkerframework:checker-qual:3.12.0"
+ "org.checkerframework:checker-qual:3.33.0"
],
- "file": "v1/https/repo1.maven.org/maven2/com/google/guava/guava-testlib/31.1-jre/guava-testlib-31.1-jre.jar",
+ "file": "v1/https/repo1.maven.org/maven2/com/google/guava/guava-testlib/32.0.0-jre/guava-testlib-32.0.0-jre.jar",
"mirror_urls": [
- "https://repo1.maven.org/maven2/com/google/guava/guava-testlib/31.1-jre/guava-testlib-31.1-jre.jar",
- "https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/31.1-jre/guava-testlib-31.1-jre.jar"
+ "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"
],
- "sha256": "aadc71b10d5c3ac474dd16be84cfb18d257e584d1e0a59f8cab64ef4376226ce",
- "url": "https://repo1.maven.org/maven2/com/google/guava/guava-testlib/31.1-jre/guava-testlib-31.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"
},
{
- "coord": "com.google.guava:guava:31.1-jre",
+ "coord": "com.google.guava:guava:32.0.0-jre",
"dependencies": [
"com.google.code.findbugs:jsr305:3.0.2",
- "com.google.errorprone:error_prone_annotations:2.11.0",
+ "com.google.errorprone:error_prone_annotations:2.18.0",
"com.google.guava:failureaccess:1.0.1",
"com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
- "com.google.j2objc:j2objc-annotations:1.3",
- "org.checkerframework:checker-qual:3.12.0"
+ "com.google.j2objc:j2objc-annotations:2.8",
+ "org.checkerframework:checker-qual:3.33.0"
],
"directDependencies": [
"com.google.code.findbugs:jsr305:3.0.2",
- "com.google.errorprone:error_prone_annotations:2.11.0",
+ "com.google.errorprone:error_prone_annotations:2.18.0",
"com.google.guava:failureaccess:1.0.1",
"com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
- "com.google.j2objc:j2objc-annotations:1.3",
- "org.checkerframework:checker-qual:3.12.0"
+ "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/31.1-jre/guava-31.1-jre.jar",
+ "file": "v1/https/repo1.maven.org/maven2/com/google/guava/guava/32.0.0-jre/guava-32.0.0-jre.jar",
"mirror_urls": [
- "https://repo1.maven.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.jar",
- "https://repo.maven.apache.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.jar"
+ "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"
],
- "sha256": "a42edc9cab792e39fe39bb94f3fca655ed157ff87a8af78e1d6ba5b07c4a00ab",
- "url": "https://repo1.maven.org/maven2/com/google/guava/guava/31.1-jre/guava-31.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"
},
{
"coord": "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
@@ -476,33 +476,33 @@
"url": "https://repo1.maven.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
},
{
- "coord": "com.google.j2objc:j2objc-annotations:1.3",
+ "coord": "com.google.j2objc:j2objc-annotations:2.8",
"dependencies": [],
"directDependencies": [],
- "file": "v1/https/repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar",
+ "file": "v1/https/repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8.jar",
"mirror_urls": [
- "https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar",
- "https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar"
+ "https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8.jar",
+ "https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8.jar"
],
- "sha256": "21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b",
- "url": "https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar"
+ "sha256": "f02a95fa1a5e95edb3ed859fd0fb7df709d121a35290eff8b74dce2ab7f4d6ed",
+ "url": "https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8.jar"
},
{
"coord": "com.google.truth:truth:1.1.2",
"dependencies": [
"com.google.auto.value:auto-value-annotations:1.8.1",
- "com.google.errorprone:error_prone_annotations:2.11.0",
- "com.google.guava:guava:31.1-jre",
+ "com.google.errorprone:error_prone_annotations:2.18.0",
+ "com.google.guava:guava:32.0.0-jre",
"junit:junit:4.13.2",
- "org.checkerframework:checker-qual:3.12.0",
+ "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.11.0",
- "com.google.guava:guava:31.1-jre",
+ "com.google.errorprone:error_prone_annotations:2.18.0",
+ "com.google.guava:guava:32.0.0-jre",
"junit:junit:4.13.2",
- "org.checkerframework:checker-qual:3.12.0",
+ "org.checkerframework:checker-qual:3.33.0",
"org.ow2.asm:asm:9.0"
],
"file": "v1/https/repo1.maven.org/maven2/com/google/truth/truth/1.1.2/truth-1.1.2.jar",
@@ -687,16 +687,16 @@
"url": "https://repo1.maven.org/maven2/org/checkerframework/checker-compat-qual/2.5.3/checker-compat-qual-2.5.3.jar"
},
{
- "coord": "org.checkerframework:checker-qual:3.12.0",
+ "coord": "org.checkerframework:checker-qual:3.33.0",
"dependencies": [],
"directDependencies": [],
- "file": "v1/https/repo1.maven.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar",
+ "file": "v1/https/repo1.maven.org/maven2/org/checkerframework/checker-qual/3.33.0/checker-qual-3.33.0.jar",
"mirror_urls": [
- "https://repo1.maven.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar",
- "https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar"
+ "https://repo1.maven.org/maven2/org/checkerframework/checker-qual/3.33.0/checker-qual-3.33.0.jar",
+ "https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.33.0/checker-qual-3.33.0.jar"
],
- "sha256": "ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb",
- "url": "https://repo1.maven.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar"
+ "sha256": "e316255bbfcd9fe50d165314b85abb2b33cb2a66a93c491db648e498a82c2de1",
+ "url": "https://repo1.maven.org/maven2/org/checkerframework/checker-qual/3.33.0/checker-qual-3.33.0.jar"
},
{
"coord": "org.hamcrest:hamcrest-core:1.3",
diff --git a/protobuf_deps.bzl b/protobuf_deps.bzl
index 95ecb3c97a2f..69b0a4e2af45 100644
--- a/protobuf_deps.bzl
+++ b/protobuf_deps.bzl
@@ -7,9 +7,9 @@ PROTOBUF_MAVEN_ARTIFACTS = [
"com.google.code.findbugs:jsr305:3.0.2",
"com.google.code.gson:gson:2.8.9",
"com.google.errorprone:error_prone_annotations:2.5.1",
- "com.google.j2objc:j2objc-annotations:1.3",
- "com.google.guava:guava:31.1-jre",
- "com.google.guava:guava-testlib:31.1-jre",
+ "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.truth:truth:1.1.2",
"junit:junit:4.13.2",
"org.mockito:mockito-core:4.3.1",