From 19ae0a73e4718c58f741d65688ce1e273c3dfc91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Coet?= <aurelien.coet@sonarsource.com>
Date: Fri, 13 Feb 2026 08:54:52 +0100
Subject: [PATCH] Update the Guava project to support Java 21

---
 guava/pom.xml                                         | 2 +-
 guava/src/com/google/common/collect/Collections2.java | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/guava/pom.xml b/guava/pom.xml
index fb7923a4c..bb4fe7c03 100644
--- a/guava/pom.xml
+++ b/guava/pom.xml
@@ -19,7 +19,7 @@
     per the JSR-305 spec.
   </description>
   <properties>
-    <java.version>1.6</java.version>
+    <java.version>1.8</java.version>
   </properties>
   <dependencies>
     <dependency>
diff --git a/guava/src/com/google/common/collect/Collections2.java b/guava/src/com/google/common/collect/Collections2.java
index 5e661e151..c412697a0 100644
--- a/guava/src/com/google/common/collect/Collections2.java
+++ b/guava/src/com/google/common/collect/Collections2.java
@@ -18,7 +18,6 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Predicates.and;
 import static com.google.common.base.Predicates.in;
 import static com.google.common.base.Predicates.not;
 import static com.google.common.collect.CollectPreconditions.checkNonnegative;
@@ -196,12 +195,12 @@ public boolean remove(Object element) {
 
     @Override
     public boolean removeAll(final Collection<?> collection) {
-      return Iterables.removeIf(unfiltered, and(predicate, in(collection)));
+      return Iterables.removeIf(unfiltered, Predicates.<E>and(predicate, in(collection)));
     }
 
     @Override
     public boolean retainAll(final Collection<?> collection) {
-      return Iterables.removeIf(unfiltered, and(predicate, not(in(collection))));
+      return Iterables.removeIf(unfiltered, Predicates.<E>and(predicate, not(in(collection))));
     }
 
     @Override