This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-10369 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 670150b286e342b39cd8257c13cad3e27db14b57 Author: Julian Reschke <resc...@apache.org> AuthorDate: Thu Jul 27 12:16:57 2023 +0100 OAK-10369: oak-segment-azure/oak-blob-cloud-azure leak Guava dependency - adjust import range --- oak-blob-cloud-azure/pom.xml | 4 ++++ oak-parent/pom.xml | 1 + oak-segment-azure/pom.xml | 1 + 3 files changed, 6 insertions(+) diff --git a/oak-blob-cloud-azure/pom.xml b/oak-blob-cloud-azure/pom.xml index 4e92154558..d0b159b4f1 100644 --- a/oak-blob-cloud-azure/pom.xml +++ b/oak-blob-cloud-azure/pom.xml @@ -37,6 +37,10 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> + <Import-Package> + <!-- OAK-10369 -->${guava.osgi.import}, + * + </Import-Package> <Export-Package> org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage </Export-Package> diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml index 87672f7fbc..330a587b92 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -61,6 +61,7 @@ <logback.version>1.2.10</logback.version> <h2.version>2.1.214</h2.version> <tika.version>1.26</tika.version> + <!-- OAK-10369 --><guava.osgi.import>com.google.common.*;version="[15.0,20)"</guava.osgi.import> <derby.version>10.14.2.0</derby.version> <jackson.version>2.13.5</jackson.version> <testcontainers.version>1.18.3</testcontainers.version> diff --git a/oak-segment-azure/pom.xml b/oak-segment-azure/pom.xml index 0dcb6f0ea1..2bf2dbb7f4 100644 --- a/oak-segment-azure/pom.xml +++ b/oak-segment-azure/pom.xml @@ -40,6 +40,7 @@ <configuration> <instructions> <Import-Package> + <!-- OAK-10369 -->${guava.osgi.import}, org.apache.jackrabbit.oak.segment.spi*, org.apache.jackrabbit.oak.segment.remote*, !org.apache.jackrabbit.oak.segment*,