Skip to content

Commit

Permalink
Bump a few Maven plugins.
Browse files Browse the repository at this point in the history
I'm not sure that any of these end up being _necessary_ to what I'm doing in #7331 (comment) / #3990 (comment). 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
  • Loading branch information
cpovirk authored and Google Java Core Libraries committed Jul 24, 2024
1 parent 5041fbe commit 76f87bb
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion android/guava/src/com/google/common/hash/BloomFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions android/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion guava/src/com/google/common/hash/BloomFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 76f87bb

Please sign in to comment.