From 13b20e10437974978ef6a855a09fff10a422c4ab Mon Sep 17 00:00:00 2001
From: sahusanket <sanketsahu@google.com>
Date: Mon, 22 Jul 2024 19:12:17 +0530
Subject: [PATCH] CDAP-21027 : upgrading hadoop version to 3.3.6 for cdap
 security ext

---
 cdap-ranger/cdap-ranger-binding/pom.xml   | 8 ++++----
 cdap-ranger/pom.xml                       | 6 +++++-
 cdap-sentry/cdap-sentry-extension/pom.xml | 2 +-
 pom.xml                                   | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/cdap-ranger/cdap-ranger-binding/pom.xml b/cdap-ranger/cdap-ranger-binding/pom.xml
index 8a45d86..b0a9c22 100644
--- a/cdap-ranger/cdap-ranger-binding/pom.xml
+++ b/cdap-ranger/cdap-ranger-binding/pom.xml
@@ -61,9 +61,9 @@
       <version>2.6</version>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
-      <version>1.8.8</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>2.12.7</version>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
@@ -102,7 +102,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.5.0</version>
         <extensions>true</extensions>
         <configuration>
           <archive>
diff --git a/cdap-ranger/pom.xml b/cdap-ranger/pom.xml
index 10c6572..4f33d60 100644
--- a/cdap-ranger/pom.xml
+++ b/cdap-ranger/pom.xml
@@ -69,7 +69,7 @@
 
 
   <properties>
-    <hadoop.version>2.3.0</hadoop.version>
+    <hadoop.version>3.3.6</hadoop.version>
     <ranger.version>0.7.0</ranger.version>
   </properties>
 
@@ -108,6 +108,10 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-reload4j</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
diff --git a/cdap-sentry/cdap-sentry-extension/pom.xml b/cdap-sentry/cdap-sentry-extension/pom.xml
index ac1dad5..67a59b5 100644
--- a/cdap-sentry/cdap-sentry-extension/pom.xml
+++ b/cdap-sentry/cdap-sentry-extension/pom.xml
@@ -40,7 +40,7 @@
   <url>http://github.com/cdapio/cdap-security-extn/cdap-sentry</url>
 
   <properties>
-    <hadoop.version>2.3.0</hadoop.version>
+    <hadoop.version>3.3.6</hadoop.version>
     <sentry.version>1.7.0</sentry.version>
   </properties>
   
diff --git a/pom.xml b/pom.xml
index 27d1c4c..62be7d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdap.version>6.9.1</cdap.version>
+    <cdap.version>6.11.0-SNAPSHOT</cdap.version>
     <commons.collections.version>3.2.2</commons.collections.version>
     <slf4j.version>1.7.15</slf4j.version>
     <junit.version>4.11</junit.version>