From e6766a635dcad2841b3cbecf3115c87c49014362 Mon Sep 17 00:00:00 2001
From: Priyanshu Bhardwaj <63417899+priyanshu-beep@users.noreply.github.com>
Date: Wed, 20 Sep 2023 13:20:44 +0530
Subject: [PATCH 1/4] Upgrade aws-java-sdk-s3 to 1.12.522, maven-bundle-plugin
 3.5.0

---
 pom.xml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index b2c38dc..34c4502 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,9 @@
     <data.pipeline.parent>system:cdap-data-pipeline[6.8.0, 7.0.0-SNAPSHOT)</data.pipeline.parent>
     <data.stream.parent>system:cdap-data-streams[6.8.0, 7.0.0-SNAPSHOT)</data.stream.parent>
     <hadoop.version>2.10.2</hadoop.version>
-    <aws.sdk.version>1.11.133</aws.sdk.version>
+    <aws.sdk.version>1.12.552</aws.sdk.version>
+    <commons.logging.version>1.1.1</commons.logging.version>
+    <httpclient.version>4.5.14</httpclient.version>
     <main.basedir>${project.basedir}</main.basedir>
   </properties>
 
@@ -249,16 +251,20 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>${commons.logging.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>${httpclient.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-java-sdk-s3</artifactId>
       <version>${aws.sdk.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.fasterxml.jackson.core</groupId>
-          <artifactId>jackson-databind</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
   </dependencies>
 
@@ -278,7 +284,7 @@
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
-          <version>2.5.4</version>
+          <version>3.5.0</version>
           <extensions>true</extensions>
           <configuration>
             <instructions>

From 15e020bd7870472134acfabc08643889af263224 Mon Sep 17 00:00:00 2001
From: Priyanshu Bhardwaj <63417899+priyanshu-beep@users.noreply.github.com>
Date: Wed, 20 Sep 2023 16:26:00 +0530
Subject: [PATCH 2/4] Updated common-logging version from 1.1.1 to 1.1.3

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 34c4502..4312223 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
     <data.stream.parent>system:cdap-data-streams[6.8.0, 7.0.0-SNAPSHOT)</data.stream.parent>
     <hadoop.version>2.10.2</hadoop.version>
     <aws.sdk.version>1.12.552</aws.sdk.version>
-    <commons.logging.version>1.1.1</commons.logging.version>
+    <commons.logging.version>1.1.3</commons.logging.version>
     <httpclient.version>4.5.14</httpclient.version>
     <main.basedir>${project.basedir}</main.basedir>
   </properties>

From c0c8de9c2d4052272c8d5366fa99350bf9069cb8 Mon Sep 17 00:00:00 2001
From: Priyanshu Bhardwaj <63417899+priyanshu-beep@users.noreply.github.com>
Date: Wed, 20 Sep 2023 16:59:44 +0530
Subject: [PATCH 3/4] Add comments to pom.xml

---
 pom.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4312223..3c6ec7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>io.cdap.plugin</groupId>
@@ -251,11 +251,15 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <!--    Conflict arose from hadoop-mapreduce-client-core.
+    Added version 1.1.3 to resolve conflicts.-->
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>${commons.logging.version}</version>
     </dependency>
+    <!--    Conflict arose from hadoop-common.
+    Added version 4.5.14 to resolve conflicts.-->
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>

From e467a8f185f1defa8dbf78b8315ffe8004918605 Mon Sep 17 00:00:00 2001
From: Priyanshu Bhardwaj <63417899+priyanshu-beep@users.noreply.github.com>
Date: Wed, 20 Sep 2023 18:16:41 +0530
Subject: [PATCH 4/4] Excluded log4j from commons-logging

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 3c6ec7f..8c62d82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -257,6 +257,12 @@
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>${commons.logging.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>    
     </dependency>
     <!--    Conflict arose from hadoop-common.
     Added version 4.5.14 to resolve conflicts.-->