You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2024/12/10 21:07:48 UTC
(jackrabbit-oak) branch trunk updated: Revert "OAK-11300: shaded-guava: remove exports for packages that are not used (anymore) - eventbus, html, xml"
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2dd56408e9 Revert "OAK-11300: shaded-guava: remove exports for packages that are not used (anymore) - eventbus, html, xml"
2dd56408e9 is described below
commit 2dd56408e978916b403dfdfbd5770d5ede8e033a
Author: Julian Reschke <re...@apache.org>
AuthorDate: Tue Dec 10 22:07:34 2024 +0100
Revert "OAK-11300: shaded-guava: remove exports for packages that are not used (anymore) - eventbus, html, xml"
This reverts commit 36789b06e6fab6b40ae5b3816a721ef2f274dc47.
---
oak-shaded-guava/pom.xml | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/oak-shaded-guava/pom.xml b/oak-shaded-guava/pom.xml
index 440b0601d4..a301f60635 100644
--- a/oak-shaded-guava/pom.xml
+++ b/oak-shaded-guava/pom.xml
@@ -57,16 +57,6 @@
<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>
@@ -97,13 +87,16 @@
${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)",