chore: update com.google.guava to latest (#310)

- chore(guava): update guava fork to latest - chore(guava): rebuild at `33.4.0` Signed-off-by: Sam Gammon <[email protected]>
elide-dev · Feb 8, 2025 · a6b133a · a6b133a
1 parent 27e30f1
commit a6b133a
Show file tree

Hide file tree

Showing 41 changed files with 121 additions and 84 deletions.
diff --git a/com.google.guava b/com.google.guava
diff --git a/repository/com/google/guava/guava-bom/33.4.0-jre-jpms/guava-bom-33.4.0-jre-jpms.pom.asc b/repository/com/google/guava/guava-bom/33.4.0-jre-jpms/guava-bom-33.4.0-jre-jpms.pom.asc
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 
-iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6QXhwAKCRAKEbBMFiME
-DyalAQDYrFqT6fKq7VwymUwFpxkipWnDJFpQ7qvbIzYShS0YuQD+K9QhWHoM2UTG
-DYxWYTVSgHsO/dgdqs7AFEOPhWpnyQA=
-=X10y
+iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6bYsAAKCRAKEbBMFiME
+D/6bAQDsNNGiOm27OZiSmYyT6hOXjovxYDdiLM8QqhelsaZktgD+Pfe9CGE4yUxA
+xrYTeUhj1bQTm3vdnwxPUqCUtBWSKAc=
+=IxQZ
 -----END PGP SIGNATURE-----
diff --git a/repository/com/google/guava/guava-bom/maven-metadata.xml b/repository/com/google/guava/guava-bom/maven-metadata.xml
@@ -9,6 +9,6 @@
       <version>33.1.0-jre-jpms</version>
       <version>33.4.0-jre-jpms</version>
     </versions>
-    <lastUpdated>20250206015935</lastUpdated>
+    <lastUpdated>20250208040816</lastUpdated>
   </versioning>
 </metadata>
diff --git a/repository/com/google/guava/guava-bom/maven-metadata.xml.md5 b/repository/com/google/guava/guava-bom/maven-metadata.xml.md5
@@ -1 +1 @@
-b31f87aa9e9a521196f2b4b5c79b455f
+485bd7cb06b184da91230239612e51f5
diff --git a/repository/com/google/guava/guava-bom/maven-metadata.xml.sha1 b/repository/com/google/guava/guava-bom/maven-metadata.xml.sha1
@@ -1 +1 @@
-0b3539379bf8cf921703e2a4f2a209505d9834f6
+ba3b9698d0b11c74e9c45ae45100b80ac5656286
diff --git a/repository/com/google/guava/guava-gwt/33.4.0-jre-jpms/guava-gwt-33.4.0-jre-jpms.jar b/repository/com/google/guava/guava-gwt/33.4.0-jre-jpms/guava-gwt-33.4.0-jre-jpms.jar
diff --git a/repository/com/google/guava/guava-gwt/33.4.0-jre-jpms/guava-gwt-33.4.0-jre-jpms.jar.asc b/repository/com/google/guava/guava-gwt/33.4.0-jre-jpms/guava-gwt-33.4.0-jre-jpms.jar.asc
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 
-iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6QXhgAKCRAKEbBMFiME
-D0irAPwNRCy0dMQOrXlOpemzIXwHyRAJTWHIsgGFNmJ/ucBcyQEA4XQvUMc4c+d1
-vcj0bGy4dGH2yUUT3QIIg5X1AeXI/w0=
-=ik2U
+iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6bYrwAKCRAKEbBMFiME
+Dw4pAP9xPxuorfaeByxVH2J3itWuWIC7H0T7A2c8tuekYIZNmwD/SZk68pJJezfZ
+vKQIE1o5ElZRNODUBWIp2Zvoc3aO0Ag=
+=4LG0
 -----END PGP SIGNATURE-----
diff --git a/repository/com/google/guava/guava-gwt/33.4.0-jre-jpms/guava-gwt-33.4.0-jre-jpms.jar.md5 b/repository/com/google/guava/guava-gwt/33.4.0-jre-jpms/guava-gwt-33.4.0-jre-jpms.jar.md5
@@ -1 +1 @@
-18530892ff99da0912eac42951e2d0dd
+ae7e3ff53e258ffe4892fe743c1e8160
diff --git a/repository/com/google/guava/guava-gwt/33.4.0-jre-jpms/guava-gwt-33.4.0-jre-jpms.jar.sha1 b/repository/com/google/guava/guava-gwt/33.4.0-jre-jpms/guava-gwt-33.4.0-jre-jpms.jar.sha1
@@ -1 +1 @@
-349a5ae5fd02bf9c60e20b54f9f39c6b50433e27
+12dd8ba37fb00b5eb9a786834ce4bf4dcc06eafd
diff --git a/repository/com/google/guava/guava-gwt/33.4.0-jre-jpms/guava-gwt-33.4.0-jre-jpms.pom.asc b/repository/com/google/guava/guava-gwt/33.4.0-jre-jpms/guava-gwt-33.4.0-jre-jpms.pom.asc
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 
-iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6QXhgAKCRAKEbBMFiME
-DxYcAQDwNr2u03sSns8zf4AKZFqm84RJYKw2J6pfhTW3aiAzzgEA+3gMRliaKfwE
-Q7oOE29EMB0Gt9RqX8UFtMuG1y8Weg8=
-=bhRj
+iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6bYrwAKCRAKEbBMFiME
+D9FXAQCkYH6fuhCkHvOkmRJxwgvyl8OSIo3hJdfVECBhwvNcgwEAsazTkNt8mB3Z
+k56TUroSm9G39uaEusu6VGiXB6J8pAo=
+=sJ7h
 -----END PGP SIGNATURE-----
diff --git a/repository/com/google/guava/guava-gwt/maven-metadata.xml b/repository/com/google/guava/guava-gwt/maven-metadata.xml
@@ -9,6 +9,6 @@
       <version>33.1.0-jre-jpms</version>
       <version>33.4.0-jre-jpms</version>
     </versions>
-    <lastUpdated>20250206015933</lastUpdated>
+    <lastUpdated>20250208040814</lastUpdated>
   </versioning>
 </metadata>
diff --git a/repository/com/google/guava/guava-gwt/maven-metadata.xml.md5 b/repository/com/google/guava/guava-gwt/maven-metadata.xml.md5
@@ -1 +1 @@
-e5ef626bc5356eebb78917713ea32585
+674cc594d72670336496bbfdf5fffa2e
diff --git a/repository/com/google/guava/guava-gwt/maven-metadata.xml.sha1 b/repository/com/google/guava/guava-gwt/maven-metadata.xml.sha1
@@ -1 +1 @@
-41644530b4533033251e0c9656ef592b18634302
+7ac0c7700ef686e3f7c208e55b04c48124228c22
diff --git a/repository/com/google/guava/guava-parent/33.4.0-jre-jpms/guava-parent-33.4.0-jre-jpms.jar b/repository/com/google/guava/guava-parent/33.4.0-jre-jpms/guava-parent-33.4.0-jre-jpms.jar
@@ -23,13 +23,7 @@
     <jspecify.version>1.0.0</jspecify.version>
     <errorprone.version>2.36.0</errorprone.version>
     <j2objc.version>3.0.0</j2objc.version>
-    <failureaccess.version>1.0.2</failureaccess.version>
-    <javac.version>9+181-r4173-1</javac.version>
-    <!-- Javadoc is pinned to the latest LTS, otherwise there are doc redirect warnings. -->
-    <javadoc.specification.version>21</javadoc.specification.version>
-    <!-- Empty for all JDKs but 9-12 -->
-    <maven-javadoc-plugin.additionalJOptions></maven-javadoc-plugin.additionalJOptions>
-    <project.build.outputTimestamp>2025-02-06T01:59:27Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-02-08T04:08:09Z</project.build.outputTimestamp>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!--
     Some tests need reflective access to the internals of these packages. It is only the
@@ -95,6 +89,7 @@
     <module>guava-gwt</module>
     <module>guava-testlib</module>
     <module>guava-tests</module>
+    <module>futures/failureaccess</module>
   </modules>
   <build>
     <!-- Handle where Guava deviates from Maven defaults -->
@@ -194,6 +189,35 @@
             <!-- Fork because we need args like add-exports. (But see the TODO above about .mvn/jvm.config.) -->
             <fork>true</fork>
           </configuration>
+          <executions>
+            <execution>
+              <id>default-compile</id>
+              <configuration>
+                <source>1.8</source>
+                <target>1.8</target>
+                <excludes>
+                  <exclude>module-info.java</exclude>
+                </excludes>
+                <compilerArgs>
+                  <!--
+                      Make includes/excludes fully work:
+                      https://issues.apache.org/jira/browse/MCOMPILER-174
+                      (Compare what guava-gwt has to do for maven-javadoc-plugin.)
+                  -->
+                  <arg>-sourcepath</arg>
+                  <arg>doesnotexist</arg>
+                </compilerArgs>
+              </configuration>
+            </execution>
+            <execution>
+              <id>default-testCompile</id>
+              <configuration>
+                <compilerArgs>
+                  <compilerArg>-Xlint:-removal</compilerArg>
+                </compilerArgs>
+              </configuration>
+            </execution>
+          </executions>
         </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
@@ -213,7 +237,20 @@
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.3.0</version>
+          <version>3.4.0</version>
+          <configuration>
+            <excludes>
+              <!-- The root module (where applicable) is withheld because it is provided at `META-INF/versions/9/`. -->
+              <exclude>/module-info.class</exclude>
+              <!-- Avoid duplicating compiled classes within the `META-INF/versions/9/` root. -->
+              <exclude>META-INF/versions/9/com/**/*.class</exclude>
+            </excludes>
+            <archive>
+              <manifestEntries>
+                <Multi-Release>true</Multi-Release>
+              </manifestEntries>
+            </archive>
+          </configuration>
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>

diff --git a/...sitory/com/google/guava/guava-parent/33.4.0-jre-jpms/guava-parent-33.4.0-jre-jpms.jar.asc b/...sitory/com/google/guava/guava-parent/33.4.0-jre-jpms/guava-parent-33.4.0-jre-jpms.jar.asc
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 
-iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6QXgQAKCRAKEbBMFiME
-D9dcAP42MGXpKYVn8cuw0zRdqUk+1CGWdJb7yN46aNQET7fmVgD/dmt4OHQv5aJk
-SrWtTfSnw2ynRMaLxzKWy582QnarIwA=
-=fHdU
+iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6bYqQAKCRAKEbBMFiME
+D406AP9OsnyzLheXGE4HC6C7E99jYywwzrU0ciAlcyzoAA0nTgEA9OLGxg3m2v1Y
+no2l7xaErHanQd6HQGAcsYSwaADzwwU=
+=EoON
 -----END PGP SIGNATURE-----
diff --git a/...sitory/com/google/guava/guava-parent/33.4.0-jre-jpms/guava-parent-33.4.0-jre-jpms.jar.md5 b/...sitory/com/google/guava/guava-parent/33.4.0-jre-jpms/guava-parent-33.4.0-jre-jpms.jar.md5
@@ -1 +1 @@
-81ade9dbf9c5a30996fb3ae28d77c46a
+f47624d10946677304373a3ca059a4a1
diff --git a/...itory/com/google/guava/guava-parent/33.4.0-jre-jpms/guava-parent-33.4.0-jre-jpms.jar.sha1 b/...itory/com/google/guava/guava-parent/33.4.0-jre-jpms/guava-parent-33.4.0-jre-jpms.jar.sha1
@@ -1 +1 @@
-7a2f6c399e6a927b98ff9e84811318b61555450f
+02a907b2f880be9ebbc540f5f8c11a4a9168946f
diff --git a/...sitory/com/google/guava/guava-parent/33.4.0-jre-jpms/guava-parent-33.4.0-jre-jpms.pom.asc b/...sitory/com/google/guava/guava-parent/33.4.0-jre-jpms/guava-parent-33.4.0-jre-jpms.pom.asc
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 
-iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6QXgQAKCRAKEbBMFiME
-D30cAP4pbeph9ElxljltUwCyzKwa3IefjIRC5Io4Fg+i7vWULAEA4mfFH3FGDlLy
-GW/JgdM5EEVYo5Um+TxGpV45U/yD7ww=
-=SrT6
+iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6bYqQAKCRAKEbBMFiME
+D5krAQDsMFZ3XlJ6tJjsPDRbVO8i3qab0NSDcLoNaUffLuGhwQEAmWWE1toszIFZ
+kPno0nclNg25j2ICqRECTGbbmh9XZQE=
+=RkDM
 -----END PGP SIGNATURE-----
diff --git a/repository/com/google/guava/guava-parent/maven-metadata.xml b/repository/com/google/guava/guava-parent/maven-metadata.xml
@@ -9,6 +9,6 @@
       <version>33.1.0-jre-jpms</version>
       <version>33.4.0-jre-jpms</version>
     </versions>
-    <lastUpdated>20250206015928</lastUpdated>
+    <lastUpdated>20250208040808</lastUpdated>
   </versioning>
 </metadata>
diff --git a/repository/com/google/guava/guava-parent/maven-metadata.xml.md5 b/repository/com/google/guava/guava-parent/maven-metadata.xml.md5
@@ -1 +1 @@
-553c793f3eccb0a1365ea9c296022d3b
+0e74f39a58744145dc7c07995c2674e2
diff --git a/repository/com/google/guava/guava-parent/maven-metadata.xml.sha1 b/repository/com/google/guava/guava-parent/maven-metadata.xml.sha1
@@ -1 +1 @@
-9f8bfbbe8f9592551f1ad99fcb03bb4ed3103b41
+6cd9ae2b0b1199ff5fdf67efacb7a6464e11e45a
diff --git a/repository/com/google/guava/guava-testlib/33.4.0-jre-jpms/guava-testlib-33.4.0-jre-jpms.jar b/repository/com/google/guava/guava-testlib/33.4.0-jre-jpms/guava-testlib-33.4.0-jre-jpms.jar
diff --git a/...tory/com/google/guava/guava-testlib/33.4.0-jre-jpms/guava-testlib-33.4.0-jre-jpms.jar.asc b/...tory/com/google/guava/guava-testlib/33.4.0-jre-jpms/guava-testlib-33.4.0-jre-jpms.jar.asc
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 
-iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6QXhAAKCRAKEbBMFiME
-DwUnAQCwCGEcUxlH6JI7dGruqfqcKbOSnJfd+Kn15O8xamg/KAD/UDB448p5cMSB
-lIKt387kCNyDEkhtwrIT041ECQ/fIgI=
-=ateR
+iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6bYrQAKCRAKEbBMFiME
+D86vAQCEH8zS7L4JxPHTcY41jYYGbBGybkGJGCYXuxcpFXKSRwEAmdo57L5jP4ek
+avA41K3jrPHl1ropqn83n2HNn48d9Q0=
+=JoQQ
 -----END PGP SIGNATURE-----
diff --git a/...tory/com/google/guava/guava-testlib/33.4.0-jre-jpms/guava-testlib-33.4.0-jre-jpms.jar.md5 b/...tory/com/google/guava/guava-testlib/33.4.0-jre-jpms/guava-testlib-33.4.0-jre-jpms.jar.md5
@@ -1 +1 @@
-eb376faa976cdc7bfe3d90dcd907d5c8
+fd98ecf7b56a29e4c62091d2971c9d83
diff --git a/...ory/com/google/guava/guava-testlib/33.4.0-jre-jpms/guava-testlib-33.4.0-jre-jpms.jar.sha1 b/...ory/com/google/guava/guava-testlib/33.4.0-jre-jpms/guava-testlib-33.4.0-jre-jpms.jar.sha1
@@ -1 +1 @@
-d4ff0ebfb6a90b342357ff1adf957a41d444a8cc
+018159e5c2a6e24282a47f0e92c0429d8db2012a
diff --git a/...tory/com/google/guava/guava-testlib/33.4.0-jre-jpms/guava-testlib-33.4.0-jre-jpms.pom.asc b/...tory/com/google/guava/guava-testlib/33.4.0-jre-jpms/guava-testlib-33.4.0-jre-jpms.pom.asc
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 
-iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6QXhAAKCRAKEbBMFiME
-D8GuAP9Hk2wL9wwSZ8v4wZRIhl/ffaP6eFDH7wjCOPyuN0v2fgEA+F4fCtUyve5x
-YcKPJ8kSp8NkttceUl1lzPotnGGU/w0=
-=AhrQ
+iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6bYrQAKCRAKEbBMFiME
+D/TQAP9ByrLyq+nPW2hIYgrJoVj9l+AfZmsw6PpdcI0ru8nc+wEAwX4psAIqh6R4
+bhCsdtr+vUGeBboBvbSBtfZaLfFMyQ0=
+=IfJK
 -----END PGP SIGNATURE-----
diff --git a/repository/com/google/guava/guava-testlib/maven-metadata.xml b/repository/com/google/guava/guava-testlib/maven-metadata.xml
@@ -9,6 +9,6 @@
       <version>33.1.0-jre-jpms</version>
       <version>33.4.0-jre-jpms</version>
     </versions>
-    <lastUpdated>20250206015931</lastUpdated>
+    <lastUpdated>20250208040812</lastUpdated>
   </versioning>
 </metadata>
diff --git a/repository/com/google/guava/guava-testlib/maven-metadata.xml.md5 b/repository/com/google/guava/guava-testlib/maven-metadata.xml.md5
@@ -1 +1 @@
-177545a4d91f40c42b75187070933a36
+c3e018868cb160a3ae40330545ee4850
diff --git a/repository/com/google/guava/guava-testlib/maven-metadata.xml.sha1 b/repository/com/google/guava/guava-testlib/maven-metadata.xml.sha1
@@ -1 +1 @@
-72c897e23eda6c8a83105640adcda45b3b835e03
+3c1b534f418c3c28e5022562db19b490afa8e2e5
diff --git a/repository/com/google/guava/guava/33.4.0-jre-jpms/guava-33.4.0-jre-jpms.jar b/repository/com/google/guava/guava/33.4.0-jre-jpms/guava-33.4.0-jre-jpms.jar
diff --git a/repository/com/google/guava/guava/33.4.0-jre-jpms/guava-33.4.0-jre-jpms.jar.asc b/repository/com/google/guava/guava/33.4.0-jre-jpms/guava-33.4.0-jre-jpms.jar.asc
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 
-iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6QXgwAKCRAKEbBMFiME
-D92AAQCL53hk4XPZEWmqsDhjrYK65Fe00O3G7pa6nKfGBm5zEAEA8Q2SCErV0uer
-J0y2XN7Xmml+VJP/XfD2M5KbP5P4HAQ=
-=65yT
+iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6bYqwAKCRAKEbBMFiME
+D49BAP0TuhKXyrhaOxD2unRFT4Cn7f74L49eUZUBAHW69Ul3iQEAwS1fsGoJfFJb
+ie/Ygf1dGz0LF+cJCNQPeqBIUBut5Qo=
+=b32G
 -----END PGP SIGNATURE-----
diff --git a/repository/com/google/guava/guava/33.4.0-jre-jpms/guava-33.4.0-jre-jpms.jar.md5 b/repository/com/google/guava/guava/33.4.0-jre-jpms/guava-33.4.0-jre-jpms.jar.md5
@@ -1 +1 @@
-282190e103a61c20fa0c0b8f5c63e7ad
+e6da38e1667ef4a89003eec4626fbc2d
diff --git a/repository/com/google/guava/guava/33.4.0-jre-jpms/guava-33.4.0-jre-jpms.jar.sha1 b/repository/com/google/guava/guava/33.4.0-jre-jpms/guava-33.4.0-jre-jpms.jar.sha1
@@ -1 +1 @@
-72b38fba8b464fcfde01f6a46503d65af2ad0ea6
+52ff5eb286781997e433794113b5ce8a76d0ce0a
diff --git a/repository/com/google/guava/guava/33.4.0-jre-jpms/guava-33.4.0-jre-jpms.pom.asc b/repository/com/google/guava/guava/33.4.0-jre-jpms/guava-33.4.0-jre-jpms.pom.asc
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 
-iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6QXgwAKCRAKEbBMFiME
-D7ixAQDk/n550g5JajiGHxhPrJAhzJstOqI5JiizyIHRXrHnxwD/aV4sGtr/qwkY
-zNds0z+QvRKgUsxXm1FaTEHWJKWrZg8=
-=kz/h
+iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6bYqwAKCRAKEbBMFiME
+DzboAQCorxEDPSMI4JEpBqo8O0ZUVsWRDIl6QsnfH1RWVhB1ewEAtK4u6VfIF4yA
+2hxK55LDLp/DxjUyk4v3eNveBn2XcgY=
+=PiL5
 -----END PGP SIGNATURE-----
diff --git a/repository/com/google/guava/guava/maven-metadata.xml b/repository/com/google/guava/guava/maven-metadata.xml
@@ -9,6 +9,6 @@
       <version>33.1.0-jre-jpms</version>
       <version>33.4.0-jre-jpms</version>
     </versions>
-    <lastUpdated>20250206015930</lastUpdated>
+    <lastUpdated>20250208040810</lastUpdated>
   </versioning>
 </metadata>
diff --git a/repository/com/google/guava/guava/maven-metadata.xml.md5 b/repository/com/google/guava/guava/maven-metadata.xml.md5
@@ -1 +1 @@
-2906ad5405766c3bab3071745546efd6
+729e69b80e9ae4f495ed787da3d19d69
diff --git a/repository/com/google/guava/guava/maven-metadata.xml.sha1 b/repository/com/google/guava/guava/maven-metadata.xml.sha1
@@ -1 +1 @@
-85e5dffa98721e95232ec2370053848b8c9dbf9e
+28a419bff87595c1e6cf9a5d8be2453a0b00b747
diff --git a/tools/poms/guava-gwt.xml.asc b/tools/poms/guava-gwt.xml.asc
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 
-iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6QXhgAKCRAKEbBMFiME
-DxYcAQDwNr2u03sSns8zf4AKZFqm84RJYKw2J6pfhTW3aiAzzgEA+3gMRliaKfwE
-Q7oOE29EMB0Gt9RqX8UFtMuG1y8Weg8=
-=bhRj
+iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6bYrwAKCRAKEbBMFiME
+D9FXAQCkYH6fuhCkHvOkmRJxwgvyl8OSIo3hJdfVECBhwvNcgwEAsazTkNt8mB3Z
+k56TUroSm9G39uaEusu6VGiXB6J8pAo=
+=sJ7h
 -----END PGP SIGNATURE-----
diff --git a/tools/poms/guava-parent.xml.asc b/tools/poms/guava-parent.xml.asc
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 
-iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6QXgQAKCRAKEbBMFiME
-D30cAP4pbeph9ElxljltUwCyzKwa3IefjIRC5Io4Fg+i7vWULAEA4mfFH3FGDlLy
-GW/JgdM5EEVYo5Um+TxGpV45U/yD7ww=
-=SrT6
+iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6bYqQAKCRAKEbBMFiME
+D5krAQDsMFZ3XlJ6tJjsPDRbVO8i3qab0NSDcLoNaUffLuGhwQEAmWWE1toszIFZ
+kPno0nclNg25j2ICqRECTGbbmh9XZQE=
+=RkDM
 -----END PGP SIGNATURE-----
diff --git a/tools/poms/guava-testlib.xml.asc b/tools/poms/guava-testlib.xml.asc
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 
-iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6QXhAAKCRAKEbBMFiME
-D8GuAP9Hk2wL9wwSZ8v4wZRIhl/ffaP6eFDH7wjCOPyuN0v2fgEA+F4fCtUyve5x
-YcKPJ8kSp8NkttceUl1lzPotnGGU/w0=
-=AhrQ
+iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6bYrQAKCRAKEbBMFiME
+D/TQAP9ByrLyq+nPW2hIYgrJoVj9l+AfZmsw6PpdcI0ru8nc+wEAwX4psAIqh6R4
+bhCsdtr+vUGeBboBvbSBtfZaLfFMyQ0=
+=IfJK
 -----END PGP SIGNATURE-----
diff --git a/tools/poms/guava.xml.asc b/tools/poms/guava.xml.asc
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 
-iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6QXgwAKCRAKEbBMFiME
-D7ixAQDk/n550g5JajiGHxhPrJAhzJstOqI5JiizyIHRXrHnxwD/aV4sGtr/qwkY
-zNds0z+QvRKgUsxXm1FaTEHWJKWrZg8=
-=kz/h
+iHUEABYKAB0WIQQV+rciop1a0gkXoMUKEbBMFiMEDwUCZ6bYqwAKCRAKEbBMFiME
+DzboAQCorxEDPSMI4JEpBqo8O0ZUVsWRDIl6QsnfH1RWVhB1ewEAtK4u6VfIF4yA
+2hxK55LDLp/DxjUyk4v3eNveBn2XcgY=
+=PiL5
 -----END PGP SIGNATURE-----
+0 −1		.github/workflows/ci.yml
+1 −1		README.md
+34 −70		android/guava-tests/test/com/google/common/util/concurrent/FuturesTest.java
+1 −1		android/guava/pom.xml
+3 −0		android/guava/src/com/google/common/net/MediaType.java
+18 −3		android/guava/src/com/google/common/util/concurrent/AbstractFuture.java
+28 −16		android/guava/src/com/google/common/util/concurrent/AggregateFutureState.java
+2 −1		android/pom.xml
+1 −11		futures/failureaccess/pom.xml
+16 −11		guava-gwt/pom.xml
+42 −81		guava-testlib/pom.xml
+0 −31		guava-tests/pom.xml
+34 −70		guava-tests/test/com/google/common/util/concurrent/FuturesTest.java
+4 −4		guava/module.json
+2 −18		guava/pom.xml
+3 −0		guava/src/com/google/common/net/MediaType.java
+18 −3		guava/src/com/google/common/util/concurrent/AbstractFuture.java
+28 −16		guava/src/com/google/common/util/concurrent/AggregateFutureState.java
+0 −2		guava/src/module-info.java
+2 −2		integration-tests/gradle/build.gradle.kts
+44 −7		pom.xml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		b31f87aa9e9a521196f2b4b5c79b455f
		485bd7cb06b184da91230239612e51f5
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0b3539379bf8cf921703e2a4f2a209505d9834f6
		ba3b9698d0b11c74e9c45ae45100b80ac5656286
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		18530892ff99da0912eac42951e2d0dd
		ae7e3ff53e258ffe4892fe743c1e8160
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		349a5ae5fd02bf9c60e20b54f9f39c6b50433e27
		12dd8ba37fb00b5eb9a786834ce4bf4dcc06eafd
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		e5ef626bc5356eebb78917713ea32585
		674cc594d72670336496bbfdf5fffa2e
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		41644530b4533033251e0c9656ef592b18634302
		7ac0c7700ef686e3f7c208e55b04c48124228c22
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		81ade9dbf9c5a30996fb3ae28d77c46a
		f47624d10946677304373a3ca059a4a1
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		7a2f6c399e6a927b98ff9e84811318b61555450f
		02a907b2f880be9ebbc540f5f8c11a4a9168946f
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		553c793f3eccb0a1365ea9c296022d3b
		0e74f39a58744145dc7c07995c2674e2