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 2023/09/13 15:02:52 UTC
[jackrabbit-oak] branch OAK-10371b created (now 875e24f80b)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch OAK-10371b
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at 875e24f80b OAK-10371: oak-segment-azure/oak-blob-cloud-azure require provided Guava, embed it instead (#1105)
This branch includes the following new commits:
new 875e24f80b OAK-10371: oak-segment-azure/oak-blob-cloud-azure require provided Guava, embed it instead (#1105)
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[jackrabbit-oak] 01/01: OAK-10371: oak-segment-azure/oak-blob-cloud-azure require provided Guava, embed it instead (#1105)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10371b
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 875e24f80b77bd959ec1f4cbfbe9fd2545726bea
Author: Julian Reschke <re...@apache.org>
AuthorDate: Wed Sep 6 17:58:39 2023 +0200
OAK-10371: oak-segment-azure/oak-blob-cloud-azure require provided Guava, embed it instead (#1105)
* OAK-10371: embed Guava in oak*azure bundles
* OAK-10371: remove provided Guava from OSGi tests
* OAK-10371: embed Guava in oak*azure bundles
Override _plugin instruction with an empty value.
* OAK-10371: embed Guava in oak*azure bundles
Override _plugin instruction with an empty value.
* OAK-10371: embed Guava in oak*azure bundles
Override _plugin instruction with an empty value.
* OAK-10371: embed Guava in oak*azure bundles
Re-added comment.
* OAK-10371: embed Guava in oak*azure bundles
Re-added comment.
* OAK-10371: use Guava version used by the SDK (for now)
* OAK-10371: suppress a few imports
---------
Co-authored-by: mbaedke <ma...@gmail.com>
---
oak-blob-cloud-azure/pom.xml | 18 ++++++++++++++----
oak-it-osgi/pom.xml | 7 -------
oak-it-osgi/test-bundles.xml | 2 --
oak-parent/pom.xml | 1 -
oak-segment-azure/pom.xml | 16 +++++++++++++---
5 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/oak-blob-cloud-azure/pom.xml b/oak-blob-cloud-azure/pom.xml
index 91d8d9a319..c002c7ce6a 100644
--- a/oak-blob-cloud-azure/pom.xml
+++ b/oak-blob-cloud-azure/pom.xml
@@ -36,10 +36,11 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <instructions>
+ <instructions combine.self="override">
<Import-Package>
- <!-- OAK-10369 -->${guava.osgi.import},
- *
+ !com.google.*,
+ !org.checkerframework.*,
+ *
</Import-Package>
<Export-Package>
org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage
@@ -47,8 +48,11 @@
<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/>
</instructions>
</configuration>
</plugin>
@@ -138,6 +142,12 @@
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-keyvault-core</artifactId>
</dependency>
+ <!-- Azure Guava dependency -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>24.1.1-jre</version>
+ </dependency>
<!-- Test dependencies -->
<dependency>
diff --git a/oak-it-osgi/pom.xml b/oak-it-osgi/pom.xml
index 9eb298afcc..3b5a7f879b 100644
--- a/oak-it-osgi/pom.xml
+++ b/oak-it-osgi/pom.xml
@@ -217,13 +217,6 @@
<artifactId>commons-lang3</artifactId>
<scope>test</scope>
</dependency>
- <!-- to be removed when OAK-10371 is resolved -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>15.0</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
diff --git a/oak-it-osgi/test-bundles.xml b/oak-it-osgi/test-bundles.xml
index 3f644c68b4..6b8906f385 100644
--- a/oak-it-osgi/test-bundles.xml
+++ b/oak-it-osgi/test-bundles.xml
@@ -30,8 +30,6 @@
<includes>
<include>javax.jcr:jcr</include>
<include>javax.servlet:javax.servlet-api</include>
- <!-- to be removed when OAK-10371 is resolved -->
- <include>com.google.guava:guava</include>
<include>org.slf4j:slf4j-api</include>
<include>ch.qos.logback:logback-core</include>
<include>ch.qos.logback:logback-classic</include>
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index c8624dcb6b..8877ae6b1a 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..bfa63ede26 100644
--- a/oak-segment-azure/pom.xml
+++ b/oak-segment-azure/pom.xml
@@ -38,12 +38,13 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <instructions>
+ <instructions combine.self="override">
<Import-Package>
- <!-- OAK-10369 -->${guava.osgi.import},
org.apache.jackrabbit.oak.segment.spi*,
org.apache.jackrabbit.oak.segment.remote*,
!org.apache.jackrabbit.oak.segment*,
+ !com.google.*,
+ !org.checkerframework.*,
*
</Import-Package>
<Export-Package>
@@ -56,8 +57,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/>
</instructions>
</configuration>
</plugin>
@@ -140,6 +144,12 @@
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-keyvault-core</artifactId>
</dependency>
+ <!-- Azure Guava dependency -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>24.1.1-jre</version>
+ </dependency>
<!-- Test dependencies -->
<dependency>