From 980313040276d1399258eaa374b025c14df195b6 Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Fri, 21 Aug 2026 15:46:21 -0400
Subject: [PATCH] fix(deps): update guava to 32.1.3-jre with variant resolution

Guava 32.1+ publishes Gradle Module Metadata with two variants
(android / standard-jvm) distinguished by the
org.gradle.jvm.environment attribute. Gradle 6.x cannot resolve this
automatically, causing 'cannot choose between variants' failures.

Add a configurations.all attribute declaration to prefer standard-jvm
(the JRE variant), which restores resolution and allows the guava
bump from 32.0.0-jre to 32.1.3-jre.

Closes GH-673
---
 build.gradle      | 11 +++++++++++
 gradle.properties |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6f48f68e..e8c26fec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,6 +20,17 @@ subprojects {
         mavenLocal()
     }
 
+    // Guava 32.1+ publishes Gradle Module Metadata with two variants
+    // (android / standard-jvm) distinguished by the org.gradle.jvm.environment
+    // attribute. Gradle 6.x doesn't resolve this automatically — tell it to
+    // prefer the standard-jvm (JRE) variant.
+    configurations.all {
+        attributes.attribute(
+            Attribute.of('org.gradle.jvm.environment', String),
+            'standard-jvm'
+        )
+    }
+
     test {
         useJUnitPlatform()
     }
diff --git a/gradle.properties b/gradle.properties
index 65997df1..a40e2bfe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,7 +14,7 @@ commonsLangVersion=2.6
 commonsLang3Version=3.20.0
 dozerVersion=5.5.1
 ehcacheVersion=3.10.8
-guavaVersion=32.0.0-jre
+guavaVersion=32.1.3-jre
 hibernateVersion=5.6.15.Final
 httpclientVersion=3.1
 httpcomponentsVersion=4.5.14