From d061dfa4b8f6cd1b4197390800260753d09b09b2 Mon Sep 17 00:00:00 2001
From: Your Name <lmcrean@gmail.com>
Date: Sun, 14 Sep 2025 18:19:24 +0100
Subject: [PATCH 1/2] Add Guava dependencies to module.json

This update introduces several new Guava-related dependencies in the module.json file, including guava-base, guava-jdk5, sisu-guava, and others. These additions enhance the project's support for Guava libraries.

RELNOTES=n/a
---
 guava/module.json | 100 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)

diff --git a/guava/module.json b/guava/module.json
index e621749cfe0d..38a3ad3de2ab 100644
--- a/guava/module.json
+++ b/guava/module.json
@@ -78,6 +78,31 @@
           "group": "com.google.collections",
           "name": "google-collections",
           "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-base",
+          "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}"
         }
       ]
     },
@@ -144,6 +169,31 @@
           "group": "com.google.collections",
           "name": "google-collections",
           "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-base",
+          "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}"
         }
       ]
     },
@@ -210,6 +260,31 @@
           "group": "com.google.collections",
           "name": "google-collections",
           "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-base",
+          "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}"
         }
       ]
     },
@@ -276,6 +351,31 @@
           "group": "com.google.collections",
           "name": "google-collections",
           "version": "${pom.version}"
+        },
+        {
+          "group": "com.google.guava",
+          "name": "guava-base",
+          "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}"
         }
       ]
     }

From 0a03cc76fc8a626028e0fa6be53e47fb066a482d Mon Sep 17 00:00:00 2001
From: Your Name <lmcrean@gmail.com>
Date: Sun, 21 Sep 2025 12:32:01 +0100
Subject: [PATCH 2/2] Remove Apache ServiceMix Guava bundle dependencies from
 module.json

---
 guava/module.json | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/guava/module.json b/guava/module.json
index 38a3ad3de2ab..bbd32353b128 100644
--- a/guava/module.json
+++ b/guava/module.json
@@ -98,11 +98,6 @@
           "group": "org.hudsonci.lib.guava",
           "name": "guava",
           "version": "${pom.version}"
-        },
-        {
-          "group": "org.apache.servicemix.bundles",
-          "name": "org.apache.servicemix.bundles.guava",
-          "version": "${pom.version}"
         }
       ]
     },
@@ -189,11 +184,6 @@
           "group": "org.hudsonci.lib.guava",
           "name": "guava",
           "version": "${pom.version}"
-        },
-        {
-          "group": "org.apache.servicemix.bundles",
-          "name": "org.apache.servicemix.bundles.guava",
-          "version": "${pom.version}"
         }
       ]
     },
@@ -280,11 +270,6 @@
           "group": "org.hudsonci.lib.guava",
           "name": "guava",
           "version": "${pom.version}"
-        },
-        {
-          "group": "org.apache.servicemix.bundles",
-          "name": "org.apache.servicemix.bundles.guava",
-          "version": "${pom.version}"
         }
       ]
     },
@@ -371,11 +356,6 @@
           "group": "org.hudsonci.lib.guava",
           "name": "guava",
           "version": "${pom.version}"
-        },
-        {
-          "group": "org.apache.servicemix.bundles",
-          "name": "org.apache.servicemix.bundles.guava",
-          "version": "${pom.version}"
         }
       ]
     }