This is an automated email from the ASF dual-hosted git repository. adulceanu pushed a commit to branch sprout-test in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/sprout-test by this push: new 7e23e6b5a1 Embedded jackson-core in both oak-segment-azure and oak-blob-cloud-azure 7e23e6b5a1 is described below commit 7e23e6b5a1e6b449386a25ac0583aba206feaea2 Author: dulceanu <andrei.dulce...@gmail.com> AuthorDate: Sun Jan 28 07:33:08 2024 +0100 Embedded jackson-core in both oak-segment-azure and oak-blob-cloud-azure --- oak-blob-cloud-azure/pom.xml | 16 ++++++++++++---- oak-segment-azure/pom.xml | 6 ++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/oak-blob-cloud-azure/pom.xml b/oak-blob-cloud-azure/pom.xml index 7c8dfac2bf..144da0d447 100644 --- a/oak-blob-cloud-azure/pom.xml +++ b/oak-blob-cloud-azure/pom.xml @@ -38,10 +38,11 @@ <configuration> <instructions combine.self="override"> <Import-Package> - !com.google.*, - !org.checkerframework.*, - !android.os, - * + !com.fasterxml.jackson.core.*, + !com.google.*, + !org.checkerframework.*, + !android.os, + * </Import-Package> <Export-Package> org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage @@ -51,6 +52,8 @@ azure-storage, azure-keyvault-core, guava, + jsr305, + jackson-core jsr305 </Embed-Dependency> <!-- needed to override value from oak-parent; can be removed when OAK-6741 is resolved --> @@ -156,6 +159,11 @@ <version>3.0.2</version> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </dependency> + <!-- Test dependencies --> <dependency> <groupId>org.apache.jackrabbit</groupId> diff --git a/oak-segment-azure/pom.xml b/oak-segment-azure/pom.xml index 39afa9723d..2d0a5de9fa 100644 --- a/oak-segment-azure/pom.xml +++ b/oak-segment-azure/pom.xml @@ -58,6 +58,7 @@ com.nimbusds.secevent.sdk*;resolution:=optional, com.sun.jna*;resolution:=optional, !org.apache.jackrabbit.oak.segment*, + !com.fasterxml.jackson.core.*, !com.google.*, !android.os, !org.checkerframework.*, @@ -84,6 +85,7 @@ azure-identity-broker, azure-json, azure-xml, + jackson-core, guava, jsr305 </Embed-Dependency> @@ -198,6 +200,10 @@ <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </dependency> <dependency> <groupId>com.azure</groupId> <artifactId>azure-xml</artifactId>