Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OAK-11300: shaded-guava: remove exports for packages that are not used (anymore) #1898

Draft
wants to merge 5 commits into
base: trunk
Choose a base branch
from
Draft

OAK-11300: shaded-guava: remove exports for packages that are not used (anymore) #1898

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
33f4d8e
OAK-11300: shaded-guava: remove exports for packages that are not use…
reschke Dec 10, 2024
5cbaf42
OAK-11300: shaded-guava: remove exports for packages that are not use…
reschke Dec 10, 2024
52027af
OAK-11300: shaded-guava: remove exports for packages that are not use…
reschke Dec 11, 2024
b3fe5d4
Merge branch 'trunk' into OAK-11300
reschke Dec 12, 2024
63a9acf
OAK-11300: shaded-guava: remove exports for packages that are not use…
reschke Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions oak-shaded-guava/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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)",
Expand Down
Loading