From 76f87bbcc20c79de5d05582b191835f8a60de452 Mon Sep 17 00:00:00 2001
From: cpovirk <cpovirk@google.com>
Date: Wed, 24 Jul 2024 11:21:55 -0700
Subject: [PATCH] Bump a few Maven plugins.

I'm not sure that any of these end up being _necessary_ to what I'm doing in https://github.com/google/guava/issues/7331#issuecomment-2248105640 / https://github.com/google/guava/issues/3990#issuecomment-1444307178. But the upgrade to `maven-surefire-plugin` changes that plugin's toolchain behavior, so I particularly want to use the new version there in advance of starting to use toolchains.

This includes a workaround for a bug in the JDK 8 javac. (I don't know why the bug is appearing only after these upgrades.)

```
Error:  /home/runner/work/guava/guava/guava/src/com/google/common/hash/BloomFilter.java:[78,29] error: cannot find symbol
  symbol:   class Serializable
  location: class BloomFilter<T>
  where T is a type-variable:
    T declared in class BloomFilter
```
RELNOTES=n/a
PiperOrigin-RevId: 655637260
---
 android/guava/src/com/google/common/hash/BloomFilter.java | 2 +-
 android/pom.xml                                           | 8 ++++----
 guava/src/com/google/common/hash/BloomFilter.java         | 2 +-
 pom.xml                                                   | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/android/guava/src/com/google/common/hash/BloomFilter.java b/android/guava/src/com/google/common/hash/BloomFilter.java
index f041f70054d2..3ae6b68c2297 100644
--- a/android/guava/src/com/google/common/hash/BloomFilter.java
+++ b/android/guava/src/com/google/common/hash/BloomFilter.java
@@ -74,7 +74,7 @@ public final class BloomFilter<T extends @Nullable Object> implements Predicate<
    *
    * <p>Implementations should be collections of pure functions (i.e. stateless).
    */
-  interface Strategy extends Serializable {
+  interface Strategy extends java.io.Serializable {
 
     /**
      * Sets {@code numHashFunctions} bits of the given bit array, by hashing a user element.
diff --git a/android/pom.xml b/android/pom.xml
index 954ae146a293..62e50c22f10d 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -122,7 +122,7 @@
       <plugins>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.1</version>
+          <version>3.13.0</version>
           <configuration>
             <source>1.8</source>
             <target>1.8</target>
@@ -176,7 +176,7 @@
             <dependency>
               <groupId>org.codehaus.plexus</groupId>
               <artifactId>plexus-io</artifactId>
-              <!-- DO NOT UPGRADE this past 3.4.1 until https://github.com/codehaus-plexus/plexus-io/issues/109 is fixed. -->
+              <!-- DO NOT UPGRADE this past 3.4.1 until https://github.com/codehaus-plexus/plexus-io/issues/109 is fixed (probably in 3.5.1). -->
               <version>3.4.1</version>
             </dependency>
           </dependencies>
@@ -219,7 +219,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.5.0</version>
+          <version>3.8.0</version>
           <configuration>
             <quiet>true</quiet>
             <notimestamp>true</notimestamp>
@@ -251,7 +251,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.7.2</version>
+          <version>3.3.1</version>
           <configuration>
             <includes>
               <include>${test.include}</include>
diff --git a/guava/src/com/google/common/hash/BloomFilter.java b/guava/src/com/google/common/hash/BloomFilter.java
index 3b041effb3c5..d9a1c53bee9e 100644
--- a/guava/src/com/google/common/hash/BloomFilter.java
+++ b/guava/src/com/google/common/hash/BloomFilter.java
@@ -75,7 +75,7 @@ public final class BloomFilter<T extends @Nullable Object> implements Predicate<
    *
    * <p>Implementations should be collections of pure functions (i.e. stateless).
    */
-  interface Strategy extends Serializable {
+  interface Strategy extends java.io.Serializable {
 
     /**
      * Sets {@code numHashFunctions} bits of the given bit array, by hashing a user element.
diff --git a/pom.xml b/pom.xml
index 7e634f7a644e..b0ebe218cfdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
       <plugins>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.1</version>
+          <version>3.13.0</version>
           <configuration>
             <source>1.8</source>
             <target>1.8</target>
@@ -177,7 +177,7 @@
             <dependency>
               <groupId>org.codehaus.plexus</groupId>
               <artifactId>plexus-io</artifactId>
-              <!-- DO NOT UPGRADE this past 3.4.1 until https://github.com/codehaus-plexus/plexus-io/issues/109 is fixed. -->
+              <!-- DO NOT UPGRADE this past 3.4.1 until https://github.com/codehaus-plexus/plexus-io/issues/109 is fixed (probably in 3.5.1). -->
               <version>3.4.1</version>
             </dependency>
           </dependencies>
@@ -214,7 +214,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.5.0</version>
+          <version>3.8.0</version>
           <configuration>
             <quiet>true</quiet>
             <notimestamp>true</notimestamp>
@@ -246,7 +246,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.7.2</version>
+          <version>3.3.1</version>
           <configuration>
             <includes>
               <include>${test.include}</include>