OAK-11300: shaded-guava: remove exports for packages that are not use…

…d (anymore) (#1898) * OAK-11300: shaded-guava: remove exports for packages that are not used (anymore) - eventbus, html, xml * OAK-11300: shaded-guava: remove exports for packages that are not used (anymore) - reflect * OAK-11300: shaded-guava: remove exports for packages that are not used (anymore) - net * OAK-11300: shaded-guava: remove exports for packages that are not used (anymore) - annotations
apache · Jan 6, 2025 · 786ddb4 · 786ddb4
1 parent 179728b
commit 786ddb4
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/oak-shaded-guava/pom.xml b/oak-shaded-guava/pom.xml
@@ -57,6 +57,19 @@
                   <shadedPattern>${pref}</shadedPattern>
                 </relocation>
               </relocations>
+              <filters>
+                  <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>
+                          <exclude>com/google/common/reflect/**</exclude>
+                          <exclude>com/google/common/xml/**</exclude>
+                      </excludes>
+                  </filter>
+              </filters>
               <createDependencyReducedPom>true</createDependencyReducedPom>
               <createSourcesJar>true</createSourcesJar>
             </configuration>
@@ -82,21 +95,16 @@
             <!-- 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",
               ${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.math;version="${exported.guava.version}",
               ${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)",