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 8202844f15c4876369dabddfdbc96c68ea49956f Author: Julian Reschke <[email protected]> AuthorDate: Mon Apr 7 09:11:06 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)",
