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 15:39:33 UTC
(jackrabbit-oak) 01/01: OAK-11643: Update (shaded) Guava to 33.4.6
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-11643
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit b0bb8cc7a1a0e42faedf46cf6ff2937dc51202b8
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Mon Apr 7 16:39:19 2025 +0100
OAK-11643: Update (shaded) Guava to 33.4.6
---
oak-shaded-guava/pom.xml | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/oak-shaded-guava/pom.xml b/oak-shaded-guava/pom.xml
index 22cf8888ae..44f43b67e1 100644
--- a/oak-shaded-guava/pom.xml
+++ b/oak-shaded-guava/pom.xml
@@ -28,8 +28,7 @@
<packaging>bundle</packaging>
<properties>
- <shaded.guava.version>33.4.0-jre</shaded.guava.version>
- <exported.guava.version>33.4.0</exported.guava.version>
+ <shaded.guava.version>33.4.6-jre</shaded.guava.version>
<pref>org.apache.jackrabbit.guava</pref>
</properties>
@@ -95,16 +94,17 @@
<!-- 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",
+ <!-- package versions as recommended by baseline -->
+ ${pref}.common.base;version="33.5.0",
+ ${pref}.common.cache;version="33.4.1";uses:="${pref}.common.base,${pref}.common.collect,${pref}.common.util.concurrent",
+ ${pref}.common.collect;version="34.0.0";uses:="${pref}.common.base",
+ ${pref}.common.escape;version="33.4.1";uses:="${pref}.common.base",
+ ${pref}.common.graph;version="33.4.1";uses:="${pref}.common.collect",
+ ${pref}.common.hash;version="33.5.0";uses:="${pref}.common.base",
+ ${pref}.common.io;version="33.4.1";uses:="${pref}.common.base,${pref}.common.collect,${pref}.common.graph,${pref}.common.hash",
+ ${pref}.common.math;version="33.4.1",
+ ${pref}.common.primitives;version="33.4.1";uses:="${pref}.common.base",
+ ${pref}.common.util.concurrent;version="33.4.1";uses:="${pref}.common.base,${pref}.common.collect,${pref}.common.util.concurrent.internal",
</Export-Package>
<Import-Package>
javax.annotation;resolution:=optional;version="[3.0,4)",