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 a1b8e60bf8 OAK-11643: Update (shaded) Guava to 33.4.6 (#2214)
a1b8e60bf8 is described below
commit a1b8e60bf8eeb7741c08c1d59de2cb0709f71507
Author: Julian Reschke <[email protected]>
AuthorDate: Wed Apr 9 06:13:36 2025 +0200
OAK-11643: Update (shaded) Guava to 33.4.6 (#2214)
---
oak-shaded-guava/pom.xml | 29 ++++++++++++-----------------
1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/oak-shaded-guava/pom.xml b/oak-shaded-guava/pom.xml
index 22cf8888ae..c9311d0b47 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,19 +94,19 @@
<!-- 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)",
javax.crypto;resolution:=optional,
javax.crypto.spec;resolution:=optional,
sun.misc;resolution:=optional
@@ -124,9 +123,5 @@
<artifactId>guava</artifactId>
<version>${shaded.guava.version}</version>
</dependency>
- <dependency>
- <groupId>org.jetbrains</groupId>
- <artifactId>annotations</artifactId>
- </dependency>
</dependencies>
</project>
