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 6c0fab7946 OAK-9994: avoid leaking out transitive dependencies to
Guava (#751)
6c0fab7946 is described below
commit 6c0fab7946d4b3668db51e31e084c25256359e03
Author: Julian Reschke <[email protected]>
AuthorDate: Tue Nov 15 20:20:47 2022 +0100
OAK-9994: avoid leaking out transitive dependencies to Guava (#751)
* OAK-9994: oak-auth-external - declare Guava dependency as 'provided'
* OAK-9994: oak-auth-ldap - declare Guava dependency as 'test'
* OAK-9994: oak-authorization-cug - declare Guava dependency as 'provided'
* OAK-9994: oak-authorization-principalbased - declare Guava dependency as
'provided'
* OAK-9994: oak-blob-cloud-azure - declare Guava dependency as 'provided'
* OAK-9994: oak-blob - declare Guava dependency as 'provided'
* OAK-9994: oak-blob-plugins - declare Guava dependency as 'provided'
* OAK-9994: oak-blob - declare Guava dependency as 'provided'
* OAK-9994: oak-commons - declare Guava dependency as 'provided'
* OAK-9994: oak-core-spi - declare Guava dependency as 'provided'
* OAK-9994: oak-core - declare Guava dependency as 'provided'
* OAK-9994: oak-exercise - declare Guava dependency as 'provided'
* OAK-9994: oak-http - declare Guava dependency as 'provided'
* OAK-9994: oak-jcr - declare Guava dependency as 'provided'
* OAK-9994: oak-query-spi - declare Guava dependency as 'provided'
* OAK-9994: oak-run-commons - declare Guava dependency as 'provided'
* OAK-9994: oak-security-spi - declare Guava dependency as 'provided'
* OAK-9994: oak-store-composite - declare Guava dependency as 'provided'
* OAK-9994: oak-store-document - declare Guava dependency as 'provided'
* OAK-9994: oak-store-search - add missing Guava dependency as 'provided'
* OAK-9994: oak-lucene - add missing Guava dependency as 'provided'
* OAK-9994: oak-it-osgi - add missing Guava dependency as 'test'
* OAK-9994: oak-pojosr - add missing Guava dependency as 'provided'
* OAK-9994: oak-search-elastic - add missing Guava dependency as 'provided'
* OAK-9994: oak-store-spi - declare Guava dependency as 'provided'
---
oak-auth-external/pom.xml | 1 +
oak-auth-ldap/pom.xml | 11 +++++------
oak-authorization-cug/pom.xml | 1 +
oak-authorization-principalbased/pom.xml | 1 +
oak-blob-cloud-azure/pom.xml | 7 +++++++
oak-blob-cloud/pom.xml | 1 +
oak-blob-plugins/pom.xml | 1 +
oak-blob/pom.xml | 1 +
oak-commons/pom.xml | 1 +
oak-core-spi/pom.xml | 1 +
oak-core/pom.xml | 1 +
oak-exercise/pom.xml | 1 +
oak-http/pom.xml | 5 +++++
oak-it-osgi/pom.xml | 5 +++++
oak-jcr/pom.xml | 1 +
oak-lucene/pom.xml | 7 +++++++
oak-pojosr/pom.xml | 7 +++++++
oak-query-spi/pom.xml | 1 +
oak-run-commons/pom.xml | 1 +
oak-search-elastic/pom.xml | 8 ++++++++
oak-search/pom.xml | 11 +++++++++++
oak-security-spi/pom.xml | 1 +
oak-store-composite/pom.xml | 1 +
oak-store-document/pom.xml | 1 +
oak-store-spi/pom.xml | 1 +
25 files changed, 72 insertions(+), 6 deletions(-)
diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml
index 59f1e14395..8c59c98e39 100644
--- a/oak-auth-external/pom.xml
+++ b/oak-auth-external/pom.xml
@@ -141,6 +141,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Logging -->
diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml
index d2bb16fa06..24d20d7ed1 100644
--- a/oak-auth-ldap/pom.xml
+++ b/oak-auth-ldap/pom.xml
@@ -148,12 +148,6 @@
<version>${project.version}</version>
</dependency>
- <!-- General utility libraries -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -194,6 +188,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml
index e4979e22a9..071a5c483f 100644
--- a/oak-authorization-cug/pom.xml
+++ b/oak-authorization-cug/pom.xml
@@ -92,6 +92,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- JCR and Jackrabbit dependencies -->
diff --git a/oak-authorization-principalbased/pom.xml
b/oak-authorization-principalbased/pom.xml
index b4c2e785c1..2e13e9ee44 100644
--- a/oak-authorization-principalbased/pom.xml
+++ b/oak-authorization-principalbased/pom.xml
@@ -133,6 +133,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Logging -->
diff --git a/oak-blob-cloud-azure/pom.xml b/oak-blob-cloud-azure/pom.xml
index 5d50a5eb88..73bb3925a3 100644
--- a/oak-blob-cloud-azure/pom.xml
+++ b/oak-blob-cloud-azure/pom.xml
@@ -98,6 +98,13 @@
<version>${jackrabbit.version}</version>
</dependency>
+ <!-- General utility libraries -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Dependencies to other Oak components -->
<dependency>
<groupId>org.apache.jackrabbit</groupId>
diff --git a/oak-blob-cloud/pom.xml b/oak-blob-cloud/pom.xml
index 15c689e12f..e31a189af8 100644
--- a/oak-blob-cloud/pom.xml
+++ b/oak-blob-cloud/pom.xml
@@ -180,6 +180,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/oak-blob-plugins/pom.xml b/oak-blob-plugins/pom.xml
index 377fa59a21..90ad03dab9 100644
--- a/oak-blob-plugins/pom.xml
+++ b/oak-blob-plugins/pom.xml
@@ -128,6 +128,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/oak-blob/pom.xml b/oak-blob/pom.xml
index 770cfe88b8..8088f12929 100644
--- a/oak-blob/pom.xml
+++ b/oak-blob/pom.xml
@@ -96,6 +96,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/oak-commons/pom.xml b/oak-commons/pom.xml
index 4bbd335a98..d7be4d1445 100644
--- a/oak-commons/pom.xml
+++ b/oak-commons/pom.xml
@@ -95,6 +95,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/oak-core-spi/pom.xml b/oak-core-spi/pom.xml
index a6e96dad98..b3a7483820 100644
--- a/oak-core-spi/pom.xml
+++ b/oak-core-spi/pom.xml
@@ -132,6 +132,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Logging -->
diff --git a/oak-core/pom.xml b/oak-core/pom.xml
index 1f066ac2c2..213e23714d 100644
--- a/oak-core/pom.xml
+++ b/oak-core/pom.xml
@@ -288,6 +288,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/oak-exercise/pom.xml b/oak-exercise/pom.xml
index f402ebddbf..a19a24a6e6 100644
--- a/oak-exercise/pom.xml
+++ b/oak-exercise/pom.xml
@@ -165,6 +165,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/oak-http/pom.xml b/oak-http/pom.xml
index 0ddb64a23c..bd4134b608 100644
--- a/oak-http/pom.xml
+++ b/oak-http/pom.xml
@@ -92,6 +92,11 @@
<version>2.5</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Nullability annotations -->
<dependency>
diff --git a/oak-it-osgi/pom.xml b/oak-it-osgi/pom.xml
index f8fb945737..8a4e1b1619 100644
--- a/oak-it-osgi/pom.xml
+++ b/oak-it-osgi/pom.xml
@@ -202,6 +202,11 @@
<artifactId>commons-lang3</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
diff --git a/oak-jcr/pom.xml b/oak-jcr/pom.xml
index bc1ebf3b8a..4ed74cae23 100644
--- a/oak-jcr/pom.xml
+++ b/oak-jcr/pom.xml
@@ -371,6 +371,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/oak-lucene/pom.xml b/oak-lucene/pom.xml
index 073ddee2d0..3f2965ca75 100644
--- a/oak-lucene/pom.xml
+++ b/oak-lucene/pom.xml
@@ -213,6 +213,13 @@
<version>${project.version}</version>
</dependency>
+ <!-- General utility libraries -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Lucene dependencies -->
<dependency>
<groupId>org.apache.lucene</groupId>
diff --git a/oak-pojosr/pom.xml b/oak-pojosr/pom.xml
index 19911e6b6c..69e23868e1 100644
--- a/oak-pojosr/pom.xml
+++ b/oak-pojosr/pom.xml
@@ -133,6 +133,13 @@
<artifactId>commons-io</artifactId>
</dependency>
+ <!-- General utility libraries -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Required to route OSGi LogEvents to Slf4j-->
<dependency>
<groupId>org.apache.sling</groupId>
diff --git a/oak-query-spi/pom.xml b/oak-query-spi/pom.xml
index eec81df329..e4eb4cb600 100644
--- a/oak-query-spi/pom.xml
+++ b/oak-query-spi/pom.xml
@@ -92,6 +92,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Nullability annotations -->
diff --git a/oak-run-commons/pom.xml b/oak-run-commons/pom.xml
index a75c453ec3..c09fae9485 100644
--- a/oak-run-commons/pom.xml
+++ b/oak-run-commons/pom.xml
@@ -99,6 +99,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
diff --git a/oak-search-elastic/pom.xml b/oak-search-elastic/pom.xml
index d8ffdf51a1..ddce5127e7 100644
--- a/oak-search-elastic/pom.xml
+++ b/oak-search-elastic/pom.xml
@@ -47,6 +47,7 @@
org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexProviderService
</_exportcontents>
<Import-Package>
+ <!-- OAK-7182 -->${guava.osgi.import},
!jdk.net.*,
!org.apache.avalon.framework.logger.*,
!org.apache.log.*,
@@ -253,6 +254,13 @@
<scope>test</scope>
</dependency>
+ <!-- General utility libraries -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/oak-search/pom.xml b/oak-search/pom.xml
index 357a041356..35cdc1b21b 100644
--- a/oak-search/pom.xml
+++ b/oak-search/pom.xml
@@ -40,6 +40,10 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ <!-- OAK-7182 -->${guava.osgi.import},
+ *
+ </Import-Package>
<Export-Package>
!*
</Export-Package>
@@ -130,6 +134,13 @@
<scope>provided</scope>
</dependency>
+ <!-- General utility libraries -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/oak-security-spi/pom.xml b/oak-security-spi/pom.xml
index 674b59f3ac..e4d127766b 100644
--- a/oak-security-spi/pom.xml
+++ b/oak-security-spi/pom.xml
@@ -147,6 +147,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Logging -->
diff --git a/oak-store-composite/pom.xml b/oak-store-composite/pom.xml
index 974e6248a7..6f4f9db65f 100644
--- a/oak-store-composite/pom.xml
+++ b/oak-store-composite/pom.xml
@@ -133,6 +133,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>provided</scope>
</dependency>
diff --git a/oak-store-document/pom.xml b/oak-store-document/pom.xml
index c48454421a..6057bbf715 100644
--- a/oak-store-document/pom.xml
+++ b/oak-store-document/pom.xml
@@ -147,6 +147,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/oak-store-spi/pom.xml b/oak-store-spi/pom.xml
index 35a6823ff8..d95033ec97 100644
--- a/oak-store-spi/pom.xml
+++ b/oak-store-spi/pom.xml
@@ -112,6 +112,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
