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 2025/04/07 08:15:46 UTC
(jackrabbit-oak) branch OAK-11645 created (now a3b127e6c6)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch OAK-11645
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at a3b127e6c6 OAK-11645: take over package versions for shaded guava
This branch includes the following new commits:
new a3b127e6c6 OAK-11645: take over package versions for shaded guava
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(jackrabbit-oak) 01/01: OAK-11645: take over package versions for shaded guava
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-11645
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit a3b127e6c615102fb31b760aeeab1c0e46193929
Author: Julian Reschke <re...@apache.org>
AuthorDate: Mon Apr 7 09:15:26 2025 +0100
OAK-11645: take over package versions for shaded guava
---
oak-shaded-guava/pom.xml | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/oak-shaded-guava/pom.xml b/oak-shaded-guava/pom.xml
index 22cf8888ae..a2362beee3 100644
--- a/oak-shaded-guava/pom.xml
+++ b/oak-shaded-guava/pom.xml
@@ -29,7 +29,6 @@
<properties>
<shaded.guava.version>33.4.0-jre</shaded.guava.version>
- <exported.guava.version>33.4.0</exported.guava.version>
<pref>org.apache.jackrabbit.guava</pref>
</properties>
@@ -95,16 +94,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.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.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.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",
+ ${pref}.common.base;version="50.0.0",
+ ${pref}.common.cache;version="50.0.0";uses:="${pref}.common.base,${pref}.common.collect,${pref}.common.util.concurrent",
+ ${pref}.common.collect;version="50.0.0";uses:="${pref}.common.base",
+ ${pref}.common.escape;version="50.0.0";uses:="${pref}.common.base",
+ ${pref}.common.graph;version="50.0.0";uses:="${pref}.common.collect",
+ ${pref}.common.hash;version="50.0.0";uses:="${pref}.common.base",
+ ${pref}.common.io;version="50.0.0";uses:="${pref}.common.base,${pref}.common.collect,${pref}.common.graph,${pref}.common.hash",
+ ${pref}.common.math;version="50.0.0",
+ ${pref}.common.primitives;version="50.0.0";uses:="${pref}.common.base",
+ ${pref}.common.util.concurrent;version="50.0.0";uses:="${pref}.common.base,${pref}.common.collect,${pref}.common.util.concurrent.internal",
</Export-Package>
<Import-Package>
javax.annotation;resolution:=optional;version="[3.0,4)",