This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 612cfd631a HDDS-8320. Fix ranger jackson version conflict (#4504)
612cfd631a is described below
commit 612cfd631a95cc58031f6e9a7ffa348c48ad8168
Author: Swaminathan Balachandran <[email protected]>
AuthorDate: Fri Mar 31 00:30:04 2023 -0700
HDDS-8320. Fix ranger jackson version conflict (#4504)
---
hadoop-ozone/dist/src/main/license/jar-report.txt | 3 +++
hadoop-ozone/ozone-manager/pom.xml | 31 ++++++++++++++++++++---
pom.xml | 2 ++
3 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt
b/hadoop-ozone/dist/src/main/license/jar-report.txt
index 44b835a4cb..abf685fb12 100644
--- a/hadoop-ozone/dist/src/main/license/jar-report.txt
+++ b/hadoop-ozone/dist/src/main/license/jar-report.txt
@@ -93,11 +93,14 @@ share/ozone/lib/ion-java.jar
share/ozone/lib/istack-commons-runtime.jar
share/ozone/lib/j2objc-annotations.jar
share/ozone/lib/jackson-annotations.jar
+share/ozone/lib/jackson-core-asl.jar
share/ozone/lib/jackson-core.jar
share/ozone/lib/jackson-databind.jar
share/ozone/lib/jackson-dataformat-cbor.jar
share/ozone/lib/jackson-dataformat-xml.jar
share/ozone/lib/jackson-datatype-jsr310.jar
+share/ozone/lib/jackson-jaxrs.jar
+share/ozone/lib/jackson-mapper-asl.jar
share/ozone/lib/jackson-module-jaxb-annotations.jar
share/ozone/lib/jaeger-client.jar
share/ozone/lib/jaeger-core.jar
diff --git a/hadoop-ozone/ozone-manager/pom.xml
b/hadoop-ozone/ozone-manager/pom.xml
index c5969004a2..974565206d 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -157,6 +157,33 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>jersey-client</artifactId>
</dependency>
+ <!-- Overrider ranger-intg jackson version -->
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>${jackson1.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson1.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-jaxrs</artifactId>
+ <version>${jackson-jaxr.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.apache.ranger</groupId>
<artifactId>ranger-intg</artifactId>
@@ -185,10 +212,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.lucene</groupId>
<artifactId>*</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>*</artifactId>
- </exclusion>
<exclusion>
<groupId>org.elasticsearch</groupId>
<artifactId>*</artifactId>
diff --git a/pom.xml b/pom.xml
index abc573f69d..b12a565752 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,6 +159,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<jersey2.version>2.34</jersey2.version>
<!-- jackson versions -->
+ <jackson1.version>1.9.13</jackson1.version>
+ <jackson-jaxr.version>1.9.13</jackson-jaxr.version>
<jackson2-bom.version>2.13.4.20221013</jackson2-bom.version>
<woodstox.version>5.4.0</woodstox.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
