From 564640ce4d1c6b7c42f5e6c41e8c0f18cfd4a885 Mon Sep 17 00:00:00 2001
From: naveenaechan <naveen.aechan@atlan.com>
Date: Thu, 4 Jan 2024 20:22:32 +0530
Subject: [PATCH] Fix jackson dep issue

---
 auth-audits/pom.xml   | 40 +++++++++++++++++++++++++++++++++++++++-
 graphdb/janus/pom.xml | 15 +++++++++++++++
 notification/pom.xml  |  5 +++++
 pom.xml               | 10 ++++++++--
 4 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/auth-audits/pom.xml b/auth-audits/pom.xml
index 60037a3183..ba0d53f0f8 100644
--- a/auth-audits/pom.xml
+++ b/auth-audits/pom.xml
@@ -47,7 +47,45 @@
             <artifactId>commons-lang</artifactId>
             <version>${commons-lang.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-solrj</artifactId>
+            <version>${solr.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty.http2</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-math3</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.woodstox</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>elasticsearch-rest-high-level-client</artifactId>
diff --git a/graphdb/janus/pom.xml b/graphdb/janus/pom.xml
index 3662d6b3b7..5daef76b4e 100644
--- a/graphdb/janus/pom.xml
+++ b/graphdb/janus/pom.xml
@@ -203,6 +203,21 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-solrj</artifactId>
+            <version>${solr.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.codehaus.woodstox</groupId>
+                    <artifactId>woodstox-core-asl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <!-- CVE Overrides for Lucene -->
         <dependency>
             <groupId>org.apache.lucene</groupId>
diff --git a/notification/pom.xml b/notification/pom.xml
index 3cd4e07de9..4d7c810708 100644
--- a/notification/pom.xml
+++ b/notification/pom.xml
@@ -151,6 +151,11 @@
                                     <artifactId>hadoop-common</artifactId>
                                     <version>${hadoop.version}</version>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.hadoop</groupId>
+                                    <artifactId>hadoop-auth</artifactId>
+                                    <version>${hadoop.version}</version>
+                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.slf4j</groupId>
                                     <artifactId>slf4j-api</artifactId>
diff --git a/pom.xml b/pom.xml
index 92764dc646..014ad6bb6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,7 +709,7 @@
         <guava.version>29.0-jre</guava.version>
         <guice.version>4.1.0</guice.version>
         <hadoop.hdfs-client.version>${hadoop.version}</hadoop.hdfs-client.version>
-        <hadoop.version>3.3.6</hadoop.version>
+        <hadoop.version>3.3.0</hadoop.version>
         <hbase.version>2.3.3</hbase.version>
         <hive.version>3.1.0</hive.version>
         <hppc.version>0.8.1</hppc.version>
@@ -739,7 +739,7 @@
         <launch-darkly.version>6.0.5</launch-darkly.version>
         <reload4j.version>1.2.19</reload4j.version>
         <log4j2.version>2.17.1</log4j2.version>
-        <lucene-solr.version>8.6.3</lucene-solr.version>
+        <lucene-solr.version>8.8.2</lucene-solr.version>
         <maven-site-plugin.version>3.7</maven-site-plugin.version>
         <MaxPermGen>512m</MaxPermGen>
         <node-for-v2.version>v9.11.1</node-for-v2.version>
@@ -1041,6 +1041,12 @@
                 </exclusions>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-auth</artifactId>
+                <version>${hadoop.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-client</artifactId>