This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10371
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 1ceeb5114fd9ef7315102592ed51a1333117caad
Author: Julian Reschke <julian.resc...@gmx.de>
AuthorDate: Wed Sep 6 10:29:45 2023 +0100
OAK-10371: embed Guava in oak*azure bundles
---
oak-blob-cloud-azure/pom.xml | 14 +++++++++-----
oak-parent/pom.xml | 1 -
oak-segment-azure/pom.xml | 11 +++++++++--
3 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/oak-blob-cloud-azure/pom.xml b/oak-blob-cloud-azure/pom.xml
index 6900a0fba8..76c68828f0 100644
--- a/oak-blob-cloud-azure/pom.xml
+++ b/oak-blob-cloud-azure/pom.xml
@@ -37,18 +37,17 @@
<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>
<DynamicImport-Package>sun.io</DynamicImport-Package>
<Embed-Dependency>
azure-storage,
- azure-keyvault-core
+ azure-keyvault-core,
+ guava
</Embed-Dependency>
+ <!-- needed to override value from oak-parent; can be
removed when OAK-6741 is resolved -->
+
<_plugin>org.apache.felix.bundleplugin.BlueprintPlugin</_plugin>
</instructions>
</configuration>
</plugin>
@@ -138,6 +137,11 @@
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-keyvault-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>32.1.2-jre</version>
+ </dependency>
<!-- Test dependencies -->
<dependency>
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index d9fa35f955..46d225679f 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -61,7 +61,6 @@
<logback.version>1.2.10</logback.version>
<h2.version>2.1.214</h2.version>
<tika.version>1.28.5</tika.version>
- <!-- OAK-10369
--><guava.osgi.import>com.google.common.*;version="[15.0,20)"</guava.osgi.import>
<derby.version>10.15.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 26e945339b..8a3d7fee39 100644
--- a/oak-segment-azure/pom.xml
+++ b/oak-segment-azure/pom.xml
@@ -40,7 +40,6 @@
<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*,
@@ -56,8 +55,11 @@
</Export-Package>
<Embed-Dependency>
azure-storage,
- azure-keyvault-core
+ azure-keyvault-core,
+ guava
</Embed-Dependency>
+ <!-- needed to override value from oak-parent; can be
removed when OAK-6741 is resolved -->
+
<_plugin>org.apache.felix.bundleplugin.BlueprintPlugin</_plugin>
</instructions>
</configuration>
</plugin>
@@ -140,6 +142,11 @@
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-keyvault-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>32.1.2-jre</version>
+ </dependency>
<!-- Test dependencies -->
<dependency>
