From 1d9ad0dbb0eb2bbd9a6790c3a95a2e25b2adfaec Mon Sep 17 00:00:00 2001
From: abhishkkumar <abhishkkumar@google.com>
Date: Tue, 13 Oct 2026 04:06:52 +0000
Subject: [PATCH 1/2] guava fixes

---
 cloudsql-mysql-plugin/pom.xml      | 5 +++++
 cloudsql-postgresql-plugin/pom.xml | 2 +-
 pom.xml                            | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/cloudsql-mysql-plugin/pom.xml b/cloudsql-mysql-plugin/pom.xml
index 195ff799b..f577d9941 100644
--- a/cloudsql-mysql-plugin/pom.xml
+++ b/cloudsql-mysql-plugin/pom.xml
@@ -82,6 +82,11 @@
       <artifactId>mysql-plugin</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>${guava.version}</version>
+    </dependency>
 
     <!-- test dependencies -->
     <dependency>
diff --git a/cloudsql-postgresql-plugin/pom.xml b/cloudsql-postgresql-plugin/pom.xml
index b297705a5..47bab0a76 100644
--- a/cloudsql-postgresql-plugin/pom.xml
+++ b/cloudsql-postgresql-plugin/pom.xml
@@ -85,7 +85,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>31.0.1-jre</version>
+      <version>${guava.version}</version>
     </dependency>
     <!-- test dependencies -->
     <dependency>
diff --git a/pom.xml b/pom.xml
index 54e6ef09e..23eb29f1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
     <!-- version properties -->
     <cdap.version>6.11.0</cdap.version>
     <cdap.plugin.version>2.13.1</cdap.plugin.version>
-    <guava.version>13.0.1</guava.version>
+    <guava.version>32.0.0-jre</guava.version>
     <hadoop.version>3.3.6</hadoop.version>
     <hsql.version>2.2.4</hsql.version>
     <junit.version>4.13</junit.version>
@@ -613,7 +613,7 @@
       <properties>
         <testSourceLocation>src/e2e-test/java</testSourceLocation>
         <TEST_RUNNER>TestRunner.java</TEST_RUNNER>
-        <guava.version>32.1.2-jre</guava.version>
+        <guava.version>32.0.0-jre</guava.version>
       </properties>
       <build>
         <testResources>
@@ -713,7 +713,7 @@
           <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.1-jre</version>
+            <version>${guava.version}</version>
           </dependency>
         </dependencies>
       </dependencyManagement>

From 46df7600e1aeba3d9e41d69a2545b1b92000d6eb Mon Sep 17 00:00:00 2001
From: abhishkkumar <abhishkkumar@google.com>
Date: Tue, 20 Oct 2026 16:08:05 +0000
Subject: [PATCH 2/2] fixes3

---
 cloudsql-mysql-plugin/pom.xml      |  6 +++
 cloudsql-postgresql-plugin/pom.xml |  6 +++
 pom.xml                            | 77 +++++++++++++++++++++++++++++-
 3 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/cloudsql-mysql-plugin/pom.xml b/cloudsql-mysql-plugin/pom.xml
index f577d9941..5b9402bdc 100644
--- a/cloudsql-mysql-plugin/pom.xml
+++ b/cloudsql-mysql-plugin/pom.xml
@@ -126,6 +126,12 @@
       <artifactId>mysql-socket-factory-connector-j-8</artifactId>
       <version>1.0.10</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
     <dependency>
diff --git a/cloudsql-postgresql-plugin/pom.xml b/cloudsql-postgresql-plugin/pom.xml
index 47bab0a76..cde5ffcb4 100644
--- a/cloudsql-postgresql-plugin/pom.xml
+++ b/cloudsql-postgresql-plugin/pom.xml
@@ -125,6 +125,12 @@
       <artifactId>postgres-socket-factory</artifactId>
       <version>1.4.0</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
     <dependency>
diff --git a/pom.xml b/pom.xml
index 23eb29f1a..eb36de991 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
     <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- version properties -->
-    <cdap.version>6.11.0</cdap.version>
+    <cdap.version>6.12.0-SNAPSHOT</cdap.version>
     <cdap.plugin.version>2.13.1</cdap.plugin.version>
     <guava.version>32.0.0-jre</guava.version>
     <hadoop.version>3.3.6</hadoop.version>
@@ -96,7 +96,24 @@
   <repositories>
     <repository>
       <id>sonatype-snapshots</id>
-      <url>https://central.sonatype.com/repository/maven-snapshots</url>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>sonatype</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>snapshot</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
     </repository>
   </repositories>
 
@@ -122,6 +139,12 @@
         <artifactId>cdap-api</artifactId>
         <version>${cdap.version}</version>
         <scope>provided</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
@@ -134,35 +157,71 @@
         <artifactId>cdap-etl-proto</artifactId>
         <version>${cdap.version}</version>
         <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>io.cdap.cdap</groupId>
         <artifactId>cdap-etl-api</artifactId>
         <version>${cdap.version}</version>
         <scope>provided</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>io.cdap.cdap</groupId>
         <artifactId>cdap-data-pipeline3_2.12</artifactId>
         <version>${cdap.version}</version>
         <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>io.cdap.cdap</groupId>
         <artifactId>hydrator-test</artifactId>
         <version>${cdap.version}</version>
         <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <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>
         <artifactId>cdap-test</artifactId>
         <version>${cdap.version}</version>
         <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>io.cdap.cdap</groupId>
@@ -174,6 +233,10 @@
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -350,6 +413,10 @@
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -729,6 +796,12 @@
           <artifactId>cdap-e2e-framework</artifactId>
           <version>0.5.0-SNAPSHOT</version>
           <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>com.google.guava</groupId>
+              <artifactId>guava</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
         <!-- https://mvnrepository.com/artifact/io.netty/netty-all -->
         <dependency>