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/01/04 19:23:39 UTC
[jackrabbit-oak] branch 1.22 updated: OAK-9994: avoid leaking out transitive dependencies to Guava (#751)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/1.22 by this push:
new a826d2addb OAK-9994: avoid leaking out transitive dependencies to Guava (#751)
a826d2addb is described below
commit a826d2addb1ebef09c98fbc8b7c41daef9cdc8a5
Author: Julian Reschke <re...@apache.org>
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 | 10 ++++++++++
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, 74 insertions(+), 6 deletions(-)
diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml
index 16f7bed016..bd86b51391 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 94baedaa4f..eea0ff82b4 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>
@@ -199,6 +193,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 15b654a029..f7297f7152 100644
--- a/oak-authorization-cug/pom.xml
+++ b/oak-authorization-cug/pom.xml
@@ -91,6 +91,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 7fdb03f6d7..9e41afc89c 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 a65903244d..2922c2feb1 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 afd8ce3c68..e51a215aac 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 3eb96eb55f..de600d492e 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 9ffb58a456..c0e9718c71 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 687d9c94b4..2106d2d6d6 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 e9b0e51d4a..f69fd1c89e 100644
--- a/oak-core-spi/pom.xml
+++ b/oak-core-spi/pom.xml
@@ -131,6 +131,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 c48145919c..8d68e792d9 100644
--- a/oak-core/pom.xml
+++ b/oak-core/pom.xml
@@ -283,6 +283,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 2d7f85824b..5c30702471 100644
--- a/oak-exercise/pom.xml
+++ b/oak-exercise/pom.xml
@@ -152,6 +152,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 f44bad8e51..98d3b76f8f 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 de572ae96d..9f0117a63b 100644
--- a/oak-it-osgi/pom.xml
+++ b/oak-it-osgi/pom.xml
@@ -198,6 +198,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 e33b855809..a63175aace 100644
--- a/oak-jcr/pom.xml
+++ b/oak-jcr/pom.xml
@@ -356,6 +356,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 a327142331..c6c2c7350c 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 02fed19291..378ee9d92d 100644
--- a/oak-pojosr/pom.xml
+++ b/oak-pojosr/pom.xml
@@ -134,6 +134,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 1eeb3bacbf..bd4fb18584 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 ace4bc35a3..5fc16dc5bb 100644
--- a/oak-run-commons/pom.xml
+++ b/oak-run-commons/pom.xml
@@ -84,6 +84,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 59154b9dbb..a65b86a721 100644
--- a/oak-search-elastic/pom.xml
+++ b/oak-search-elastic/pom.xml
@@ -46,6 +46,11 @@
<instructions>
<!-- TODO: of late not embedding this seems to working for locally, BUT it had failed initially. Need to verify-->
<!-- We need to embed lucene as it's required by various QueryBuilders-->
+ <Import-Package>
+ <!-- OAK-7182 -->${guava.osgi.import},
+ com.codahale.metrics*;version="[3.1, 4)";resolution:=optional,
+ *
+ </Import-Package>
<Embed-Dependency>
lucene-core;inline=true
elasticsearch-rest-high-level-client;inline=true
@@ -126,6 +131,11 @@
<artifactId>oak-search</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Logging -->
<dependency>
diff --git a/oak-search/pom.xml b/oak-search/pom.xml
index 915538118c..227769f4f5 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>
@@ -123,6 +127,13 @@
<version>${tika.version}</version>
</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 e7baf6b322..96c86c5c92 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 64db7256ba..acc0cea257 100644
--- a/oak-store-composite/pom.xml
+++ b/oak-store-composite/pom.xml
@@ -107,6 +107,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 c66c1ea247..e5d6ca8214 100644
--- a/oak-store-document/pom.xml
+++ b/oak-store-document/pom.xml
@@ -142,6 +142,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 d81323e716..6ecbe79235 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>