From 33f4d8ecb32edc00b30805d2a4a06d1f43413b17 Mon Sep 17 00:00:00 2001
From: Julian Reschke <reschke@apache.org>
Date: Tue, 10 Dec 2024 22:08:18 +0100
Subject: [PATCH 1/4] OAK-11300: shaded-guava: remove exports for packages that
 are not used (anymore) - eventbus, html, xml

---
 oak-shaded-guava/pom.xml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/oak-shaded-guava/pom.xml b/oak-shaded-guava/pom.xml
index a301f60635f..440b0601d4e 100644
--- a/oak-shaded-guava/pom.xml
+++ b/oak-shaded-guava/pom.xml
@@ -57,6 +57,16 @@
                   <shadedPattern>${pref}</shadedPattern>
                 </relocation>
               </relocations>
+              <filters>
+                  <filter>
+                      <artifact>*:*</artifact>
+                      <excludes>
+                          <exclude>com/google/common/eventbus/**</exclude>
+                          <exclude>com/google/common/html/**</exclude>
+                          <exclude>com/google/common/xml/**</exclude>
+                      </excludes>
+                  </filter>
+              </filters>
               <createDependencyReducedPom>true</createDependencyReducedPom>
               <createSourcesJar>true</createSourcesJar>
             </configuration>
@@ -87,16 +97,13 @@
               ${pref}.common.cache;version="${exported.guava.version}";uses:="${pref}.common.base,${pref}.common.collect,${pref}.common.util.concurrent",
               ${pref}.common.collect;version="${exported.guava.version}";uses:="${pref}.common.base",
               ${pref}.common.escape;version="${exported.guava.version}";uses:="${pref}.common.base",
-              ${pref}.common.eventbus;version="${exported.guava.version}",
               ${pref}.common.graph;version="${exported.guava.version}";uses:="${pref}.common.collect",
               ${pref}.common.hash;version="${exported.guava.version}";uses:="${pref}.common.base",
-              ${pref}.common.html;version="${exported.guava.version}";uses:="${pref}.common.escape",
               ${pref}.common.io;version="${exported.guava.version}";uses:="${pref}.common.base,${pref}.common.collect,${pref}.common.graph,${pref}.common.hash",
               ${pref}.common.math;version="${exported.guava.version}",${pref}.common.net;version="${exported.guava.version}";uses:="${pref}.common.base,${pref}.common.collect,${pref}.common.escape",
               ${pref}.common.primitives;version="${exported.guava.version}";uses:="${pref}.common.base",
               ${pref}.common.reflect;version="${exported.guava.version}";uses:="${pref}.common.collect,${pref}.common.io",
               ${pref}.common.util.concurrent;version="${exported.guava.version}";uses:="${pref}.common.base,${pref}.common.collect,${pref}.common.util.concurrent.internal",
-              ${pref}.common.xml;version="${exported.guava.version}";uses:="${pref}.common.escape"
             </Export-Package>
             <Import-Package>
               javax.annotation;resolution:=optional;version="[3.0,4)",

From 5cbaf42fdbb3a00181d4b04e2c128e436c33a83c Mon Sep 17 00:00:00 2001
From: Julian Reschke <reschke@apache.org>
Date: Tue, 10 Dec 2024 23:14:08 +0100
Subject: [PATCH 2/4] OAK-11300: shaded-guava: remove exports for packages that
 are not used (anymore) - reflect

---
 oak-shaded-guava/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oak-shaded-guava/pom.xml b/oak-shaded-guava/pom.xml
index 440b0601d4e..d5bf4907405 100644
--- a/oak-shaded-guava/pom.xml
+++ b/oak-shaded-guava/pom.xml
@@ -63,6 +63,7 @@
                       <excludes>
                           <exclude>com/google/common/eventbus/**</exclude>
                           <exclude>com/google/common/html/**</exclude>
+                          <exclude>com/google/common/reflect/**</exclude>
                           <exclude>com/google/common/xml/**</exclude>
                       </excludes>
                   </filter>
@@ -102,7 +103,6 @@
               ${pref}.common.io;version="${exported.guava.version}";uses:="${pref}.common.base,${pref}.common.collect,${pref}.common.graph,${pref}.common.hash",
               ${pref}.common.math;version="${exported.guava.version}",${pref}.common.net;version="${exported.guava.version}";uses:="${pref}.common.base,${pref}.common.collect,${pref}.common.escape",
               ${pref}.common.primitives;version="${exported.guava.version}";uses:="${pref}.common.base",
-              ${pref}.common.reflect;version="${exported.guava.version}";uses:="${pref}.common.collect,${pref}.common.io",
               ${pref}.common.util.concurrent;version="${exported.guava.version}";uses:="${pref}.common.base,${pref}.common.collect,${pref}.common.util.concurrent.internal",
             </Export-Package>
             <Import-Package>

From 52027afe62259c86cad25aaf10c19c2b5d36e46a Mon Sep 17 00:00:00 2001
From: Julian Reschke <reschke@apache.org>
Date: Wed, 11 Dec 2024 10:31:51 +0100
Subject: [PATCH 3/4] OAK-11300: shaded-guava: remove exports for packages that
 are not used (anymore) - net

---
 oak-shaded-guava/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/oak-shaded-guava/pom.xml b/oak-shaded-guava/pom.xml
index d5bf4907405..1203b8a7421 100644
--- a/oak-shaded-guava/pom.xml
+++ b/oak-shaded-guava/pom.xml
@@ -63,6 +63,7 @@
                       <excludes>
                           <exclude>com/google/common/eventbus/**</exclude>
                           <exclude>com/google/common/html/**</exclude>
+                          <exclude>com/google/common/net/**</exclude>
                           <exclude>com/google/common/reflect/**</exclude>
                           <exclude>com/google/common/xml/**</exclude>
                       </excludes>
@@ -101,7 +102,7 @@
               ${pref}.common.graph;version="${exported.guava.version}";uses:="${pref}.common.collect",
               ${pref}.common.hash;version="${exported.guava.version}";uses:="${pref}.common.base",
               ${pref}.common.io;version="${exported.guava.version}";uses:="${pref}.common.base,${pref}.common.collect,${pref}.common.graph,${pref}.common.hash",
-              ${pref}.common.math;version="${exported.guava.version}",${pref}.common.net;version="${exported.guava.version}";uses:="${pref}.common.base,${pref}.common.collect,${pref}.common.escape",
+              ${pref}.common.math;version="${exported.guava.version}",
               ${pref}.common.primitives;version="${exported.guava.version}";uses:="${pref}.common.base",
               ${pref}.common.util.concurrent;version="${exported.guava.version}";uses:="${pref}.common.base,${pref}.common.collect,${pref}.common.util.concurrent.internal",
             </Export-Package>

From 63a9acf985a8cb85bbdc3165dbf3bf81fc483506 Mon Sep 17 00:00:00 2001
From: Julian Reschke <reschke@apache.org>
Date: Thu, 12 Dec 2024 10:28:17 +0100
Subject: [PATCH 4/4] OAK-11300: shaded-guava: remove exports for packages that
 are not used (anymore) - annotations

---
 oak-shaded-guava/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oak-shaded-guava/pom.xml b/oak-shaded-guava/pom.xml
index 1203b8a7421..94937740c61 100644
--- a/oak-shaded-guava/pom.xml
+++ b/oak-shaded-guava/pom.xml
@@ -61,6 +61,7 @@
                   <filter>
                       <artifact>*:*</artifact>
                       <excludes>
+                          <exclude>com/google/common/annotations/**</exclude>
                           <exclude>com/google/common/eventbus/**</exclude>
                           <exclude>com/google/common/html/**</exclude>
                           <exclude>com/google/common/net/**</exclude>
@@ -94,7 +95,6 @@
             <!-- Export-Package and Import-Package must be declared explicitly since the maven-bundle-plugin executes before maven-shade-plugin, so the guava classes aren't present at this time.
                  Note that these should match the specifications from the MANIFEST.mf file of the guava jar this jar will be based on. -->
             <Export-Package>
-              ${pref}.common.annotations;version="${exported.guava.version}",
               ${pref}.common.base;version="${exported.guava.version}",
               ${pref}.common.cache;version="${exported.guava.version}";uses:="${pref}.common.base,${pref}.common.collect,${pref}.common.util.concurrent",
               ${pref}.common.collect;version="${exported.guava.version}";uses:="${pref}.common.base",