From 49bc9a6a4865f9ea2afabc3e02c9df76b53a7576 Mon Sep 17 00:00:00 2001
From: Laurie Crean <lmcrean@gmail.com>
Date: Sun, 14 Sep 2025 13:40:21 -0700
Subject: [PATCH] Detect conflicts with more conflicting releases of Guava.

Fixes #7990
Fixes #6666

RELNOTES=n/a
PiperOrigin-RevId: 806974529
---
 guava/module.json | 380 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 380 insertions(+)

diff --git a/guava/module.json b/guava/module.json
index e621749cfe0d..c79226e64f88 100644
--- a/guava/module.json
+++ b/guava/module.json
@@ -78,6 +78,101 @@
           "group": "com.google.collections",
           "name": "google-collections",
           "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-annotations",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-base",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-concurrent",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-io",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-primitives",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-jdk5",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "org.sonatype.sisu",
+          "name": "sisu-guava",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "org.hudsonci.lib.guava",
+          "name": "guava",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "org.apache.servicemix.bundles",
+          "name": "org.apache.servicemix.bundles.guava",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-cache",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-collect",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-concurrent",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-core",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-eventbus",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-io",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-parse",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-reflect",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "org.apache.servicemix.bundles",
+          "name": "org.apache.servicemix.bundles.guava",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.googlecode.guava-osgi",
+          "name": "guava-osgi",
+          "version": "${pom.version}"
         }
       ]
     },
@@ -144,6 +239,101 @@
           "group": "com.google.collections",
           "name": "google-collections",
           "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-annotations",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-base",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-concurrent",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-io",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-primitives",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-jdk5",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "org.sonatype.sisu",
+          "name": "sisu-guava",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "org.hudsonci.lib.guava",
+          "name": "guava",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "org.apache.servicemix.bundles",
+          "name": "org.apache.servicemix.bundles.guava",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-cache",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-collect",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-concurrent",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-core",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-eventbus",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-io",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-parse",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-reflect",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "org.apache.servicemix.bundles",
+          "name": "org.apache.servicemix.bundles.guava",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.googlecode.guava-osgi",
+          "name": "guava-osgi",
+          "version": "${pom.version}"
         }
       ]
     },
@@ -210,6 +400,101 @@
           "group": "com.google.collections",
           "name": "google-collections",
           "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-annotations",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-base",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-concurrent",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-io",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-primitives",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-jdk5",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "org.sonatype.sisu",
+          "name": "sisu-guava",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "org.hudsonci.lib.guava",
+          "name": "guava",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "org.apache.servicemix.bundles",
+          "name": "org.apache.servicemix.bundles.guava",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-cache",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-collect",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-concurrent",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-core",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-eventbus",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-io",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-parse",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-reflect",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "org.apache.servicemix.bundles",
+          "name": "org.apache.servicemix.bundles.guava",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.googlecode.guava-osgi",
+          "name": "guava-osgi",
+          "version": "${pom.version}"
         }
       ]
     },
@@ -276,6 +561,101 @@
           "group": "com.google.collections",
           "name": "google-collections",
           "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-annotations",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-base",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-concurrent",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-io",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-primitives",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-jdk5",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "org.sonatype.sisu",
+          "name": "sisu-guava",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "org.hudsonci.lib.guava",
+          "name": "guava",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "org.apache.servicemix.bundles",
+          "name": "org.apache.servicemix.bundles.guava",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-cache",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-collect",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-concurrent",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-core",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-eventbus",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-io",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-parse",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.diffplug.guava",
+          "name": "guava-reflect",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "org.apache.servicemix.bundles",
+          "name": "org.apache.servicemix.bundles.guava",
+          "version": "${pom.version}"
+        },
+        {
+          "group": "com.googlecode.guava-osgi",
+          "name": "guava-osgi",
+          "version": "${pom.version}"
         }
       ]
     }