From b00b8a6c7eafe8a3c92e92f787295a76209c48b8 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Sun, 28 Apr 2024 19:25:37 -0700
Subject: [PATCH] Fix CI wrt master/3.0 of Guava module

---
 .github/workflows/main.yml | 4 ++--
 guava/README.md            | 3 ++-
 guava/pom.xml              | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 09fe9930..5f66eebe 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,11 +23,11 @@ jobs:
       fail-fast: false
       matrix:
         java_version: ['8', '11', '17', '21']
-        guava_version: ['25.1-jre']
+        guava_version: ['33.1.0-jre']
         # Include additional permutations for JDK 8
         include:
           - java_version: '8'
-            guava_version: '20.0'
+            guava_version: '25.1-jre'
           - java_version: '8'
             guava_version: '33.1.0-jre'
     env:
diff --git a/guava/README.md b/guava/README.md
index 4747f1a4..86bd7bf8 100644
--- a/guava/README.md
+++ b/guava/README.md
@@ -12,7 +12,7 @@ To use module on Maven-based projects, use following dependency:
 <dependency>
   <groupId>com.fasterxml.jackson.datatype</groupId>
   <artifactId>jackson-datatype-guava</artifactId>
-  <version>2.17.0</version>
+  <version>3.0.0-SNAPSHOT</version>
 </dependency>
 ```
 
@@ -28,6 +28,7 @@ Following table shows the tested working ranges for recent module versions.
 
 | Module version | Min Guava | Default Guava | Max Guava |
 | -------------- | --------- | ------------- | --------- |
+| 3.0            | 25.1-jre  | 25.1-jre      | 33.1.0-jre|
 | 2.18           | 20.0      | 25.1-jre      | 33.1.0-jre|
 | 2.17           | 20.0      | 25.1-jre      | 33.1.0-jre|
 | 2.16           | 20.0      | 25.1-jre      | 33.1.0-jre|
diff --git a/guava/pom.xml b/guava/pom.xml
index 37639d06..a41dae63 100644
--- a/guava/pom.xml
+++ b/guava/pom.xml
@@ -26,9 +26,9 @@ Guava (http://code.google.com/p/guava-libraries/) types (currently mostly just c
   </contributors>
 
   <properties>
-    <!-- In Jackson 2.16 was guava 26.x
+    <!-- In Jackson 2.18 was guava 25.1-jre
       -->
-    <version.guava>32.1.3-jre</version.guava>
+    <version.guava>33.1.0-jre</version.guava>
     <version.guava.osgi>[${version.guava}.0,99)</version.guava.osgi>
 
     <!-- Generate PackageVersion.java into this directory. -->