From adab2a3ec854805134440237b3c0677f2797cf7a Mon Sep 17 00:00:00 2001
From: Sanchit Garg <sanchit.garg@cloudsufi.com>
Date: Thu, 24 Jul 2025 14:15:08 +0530
Subject: [PATCH 01/10] Exclude guava from hydrator-common and upgrade version
 to 33.4.0-jre in e2e-tests profile

---
 pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 095db5c..0e415e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,12 @@
       <groupId>io.cdap.plugin</groupId>
       <artifactId>hydrator-common</artifactId>
       <version>${cdap.plugin.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>io.cdap.cdap</groupId>
@@ -506,7 +512,7 @@
           <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.0.1-jre</version>
+            <version>33.4.0-jre</version>
             <scope>compile</scope>
           </dependency>
         </dependencies>

From 136dbee01ddc4b7d91804c4d51d8431aca08fdd6 Mon Sep 17 00:00:00 2001
From: Krish-cloudsufi <krish@cloudsufi.com>
Date: Fri, 25 Jul 2025 09:55:12 +0000
Subject: [PATCH 02/10] Downgraded guava version from 33.4.0-jre to 32.1.3-jre

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

diff --git a/pom.xml b/pom.xml
index 0e415e9..a601884 100644
--- a/pom.xml
+++ b/pom.xml
@@ -512,7 +512,7 @@
           <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>33.4.0-jre</version>
+            <version>32.1.3-jre</version>
             <scope>compile</scope>
           </dependency>
         </dependencies>

From 02a87911f925551a00525f761b566bc73eaaeb84 Mon Sep 17 00:00:00 2001
From: Krish-cloudsufi <krish@cloudsufi.com>
Date: Mon, 28 Jul 2025 09:55:10 +0000
Subject: [PATCH 03/10] Upgraded versions for httpclient and logback-classic

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

diff --git a/pom.xml b/pom.xml
index a601884..6238356 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
     <cdap.version>6.8.0</cdap.version>
     <cdap.plugin.version>2.10.0</cdap.plugin.version>
     <hadoop.version>2.10.2</hadoop.version>
-    <httpclient.version>4.3.4</httpclient.version>
+    <httpclient.version>4.5.13</httpclient.version>
     <jackson.core.version>2.8.11.1</jackson.core.version>
     <junit.version>4.12</junit.version>
     <slf4j.version>1.7.5</slf4j.version>
@@ -259,7 +259,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.2.8</version>
+      <version>1.3.15</version>
     </dependency>
     <dependency>
       <groupId>org.json</groupId>

From 275296f7a87a92c85437b57b09aaaa69a14d6582 Mon Sep 17 00:00:00 2001
From: Krish-cloudsufi <krish@cloudsufi.com>
Date: Mon, 28 Jul 2025 12:34:24 +0000
Subject: [PATCH 04/10] Reverted httpclient version change

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

diff --git a/pom.xml b/pom.xml
index 6238356..2810506 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
     <cdap.version>6.8.0</cdap.version>
     <cdap.plugin.version>2.10.0</cdap.plugin.version>
     <hadoop.version>2.10.2</hadoop.version>
-    <httpclient.version>4.5.13</httpclient.version>
+    <httpclient.version>4.3.4</httpclient.version>
     <jackson.core.version>2.8.11.1</jackson.core.version>
     <junit.version>4.12</junit.version>
     <slf4j.version>1.7.5</slf4j.version>

From bb180d87de375846a09f3e8992558525ccdf52a8 Mon Sep 17 00:00:00 2001
From: Krish-cloudsufi <krish@cloudsufi.com>
Date: Thu, 31 Jul 2025 11:13:17 +0000
Subject: [PATCH 05/10] Reverted change for logback-classic and logbcak-core

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

diff --git a/pom.xml b/pom.xml
index 2810506..a601884 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,7 +259,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.3.15</version>
+      <version>1.2.8</version>
     </dependency>
     <dependency>
       <groupId>org.json</groupId>

From a08f131d3b8c8b16e37655a6cf177fb24cdeb891 Mon Sep 17 00:00:00 2001
From: Krish-cloudsufi <krish@cloudsufi.com>
Date: Wed, 6 Aug 2025 05:53:20 +0000
Subject: [PATCH 06/10] Change scope

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

diff --git a/pom.xml b/pom.xml
index a601884..0c252d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -513,7 +513,7 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>32.1.3-jre</version>
-            <scope>compile</scope>
+            <scope>test</scope>
           </dependency>
         </dependencies>
       </dependencyManagement>

From 835c613075cba1e678a5d11f86902ed7e18d17a1 Mon Sep 17 00:00:00 2001
From: Krish-cloudsufi <krish@cloudsufi.com>
Date: Tue, 12 Aug 2025 08:03:38 +0000
Subject: [PATCH 07/10] change scope

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

diff --git a/pom.xml b/pom.xml
index 0c252d5..a601884 100644
--- a/pom.xml
+++ b/pom.xml
@@ -513,7 +513,7 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>32.1.3-jre</version>
-            <scope>test</scope>
+            <scope>compile</scope>
           </dependency>
         </dependencies>
       </dependencyManagement>

From 7505fb1573ae521699a2f37198293031be116c2e Mon Sep 17 00:00:00 2001
From: Krish-cloudsufi <krish@cloudsufi.com>
Date: Wed, 13 Aug 2025 05:28:47 +0000
Subject: [PATCH 08/10] excluded guava from guava-retrying

---
 pom.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a601884..98fd132 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,12 @@
   </repositories>
 
   <dependencies>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>32.1.3-jre</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>io.cdap.cdap</groupId>
       <artifactId>cdap-etl-api</artifactId>
@@ -243,6 +249,12 @@
       <groupId>com.github.rholder</groupId>
       <artifactId>guava-retrying</artifactId>
       <version>2.0.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
@@ -513,7 +525,7 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>32.1.3-jre</version>
-            <scope>compile</scope>
+            <scope>test</scope>
           </dependency>
         </dependencies>
       </dependencyManagement>

From b8317556ba2e7915b5000c299f6405b47ceb3140 Mon Sep 17 00:00:00 2001
From: Krish-cloudsufi <krish@cloudsufi.com>
Date: Tue, 19 Aug 2025 09:33:03 +0000
Subject: [PATCH 09/10] Guava addition in dependency management

---
 pom.xml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 98fd132..77371fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,13 +81,17 @@
     </repository>
   </repositories>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>32.1.3-jre</version>
+        <scope>compile</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>32.1.3-jre</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>io.cdap.cdap</groupId>
       <artifactId>cdap-etl-api</artifactId>
@@ -525,7 +529,7 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>32.1.3-jre</version>
-            <scope>test</scope>
+            <scope>compile</scope>
           </dependency>
         </dependencies>
       </dependencyManagement>

From a833e551db9f9327e43384ae6f968c92b543afd2 Mon Sep 17 00:00:00 2001
From: Krish-cloudsufi <krish@cloudsufi.com>
Date: Mon, 15 Sep 2025 10:35:15 +0000
Subject: [PATCH 10/10] Added guava 32.1.3-jre in dependencyManagement

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

diff --git a/pom.xml b/pom.xml
index 77371fb..ecef8a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,12 @@
     </dependencies>
   </dependencyManagement>
   <dependencies>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>32.1.3-jre</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>io.cdap.cdap</groupId>
       <artifactId>cdap-etl-api</artifactId>