From cc3636b94794a0a03c880e7b7aef6d3735817d26 Mon Sep 17 00:00:00 2001
From: Krish-cloudsufi <krish@cloudsufi.com>
Date: Fri, 25 Jul 2025 07:05:49 +0000
Subject: [PATCH 1/2] Fix: Vulnerability for guava

---
 pom.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 92300df0..e49ad96a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -754,14 +754,6 @@
         </plugins>
       </build>
       <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>31.0.1-jre</version>
-            <scope>compile</scope>
-          </dependency>
-        </dependencies>
       </dependencyManagement>
       <dependencies>
         <dependency>

From 6f6f4c6936e24c5718ab3f7aa3e8ab8c90592a34 Mon Sep 17 00:00:00 2001
From: Krish-cloudsufi <krish@cloudsufi.com>
Date: Wed, 30 Jul 2025 09:04:45 +0000
Subject: [PATCH 2/2] Added guava in dependency management

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

diff --git a/pom.xml b/pom.xml
index e49ad96a..1c13085b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,16 @@
     </repository>
   </repositories>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>32.1.3-jre</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>ch.qos.logback</groupId>
@@ -117,6 +127,12 @@
       <groupId>io.cdap.plugin</groupId>
       <artifactId>hydrator-common</artifactId>
       <version>${hydrator.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -321,6 +337,10 @@
       <version>${cdap.version}</version>
       <scope>test</scope>
       <exclusions>
+        <exclusion>
+          <groupId>io.cdap.cdap</groupId>
+          <artifactId>cdap-formats</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.apache.twill</groupId>
           <artifactId>twill-core</artifactId>
@@ -370,6 +390,12 @@
       <artifactId>cdap-data-pipeline2_2.11</artifactId>
       <version>${cdap.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.avro</groupId>
@@ -412,6 +438,12 @@
       <artifactId>cdap-data-streams2_2.11</artifactId>
       <version>${cdap.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -754,6 +786,14 @@
         </plugins>
       </build>
       <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>31.0.1-jre</version>
+            <scope>compile</scope>
+          </dependency>
+        </dependencies>
       </dependencyManagement>
       <dependencies>
         <dependency>