diff --git a/amazon-redshift-plugin/pom.xml b/amazon-redshift-plugin/pom.xml
index 043760250..85810df9d 100644
--- a/amazon-redshift-plugin/pom.xml
+++ b/amazon-redshift-plugin/pom.xml
@@ -35,6 +35,9 @@
     <repository>
       <id>redshift</id>
       <url>http://redshift-maven-repository.s3-website-us-east-1.amazonaws.com/release</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
     </repository>
   </repositories>
 
diff --git a/aurora-mysql-plugin/pom.xml b/aurora-mysql-plugin/pom.xml
index bb97695c0..b4b2305d1 100644
--- a/aurora-mysql-plugin/pom.xml
+++ b/aurora-mysql-plugin/pom.xml
@@ -93,6 +93,7 @@
           <instructions>
             <_exportcontents>
               io.cdap.plugin.auroradb.mysql.*;
+              io.cdap.plugin.db.*;
               io.cdap.plugin.db.source.*;
               io.cdap.plugin.db.sink.*;
               org.apache.commons.lang;
diff --git a/cloudsql-mysql-plugin/pom.xml b/cloudsql-mysql-plugin/pom.xml
index 195ff799b..3a0c0d81d 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>
@@ -121,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>
@@ -133,20 +144,6 @@
   
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <_exportcontents>
-              io.cdap.plugin.*
-            </_exportcontents>
-            <Embed-Dependency>*;inline=false;scope=compile</Embed-Dependency>
-            <Embed-Transitive>true</Embed-Transitive>
-            <Embed-Directory>lib</Embed-Directory>
-          </instructions>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>io.cdap</groupId>
         <artifactId>cdap-maven-plugin</artifactId>
diff --git a/cloudsql-postgresql-plugin/pom.xml b/cloudsql-postgresql-plugin/pom.xml
index b297705a5..32a9ad0a5 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>
@@ -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>
@@ -138,20 +144,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <_exportcontents>
-              io.cdap.plugin.*
-            </_exportcontents>
-            <Embed-Dependency>*;inline=false;scope=compile</Embed-Dependency>
-            <Embed-Transitive>true</Embed-Transitive>
-            <Embed-Directory>lib</Embed-Directory>
-          </instructions>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>io.cdap</groupId>
         <artifactId>cdap-maven-plugin</artifactId>
diff --git a/database-commons/src/test/java/io/cdap/plugin/db/batch/DatabasePluginTestBase.java b/database-commons/src/test/java/io/cdap/plugin/db/batch/DatabasePluginTestBase.java
index fa45dcee6..a899de693 100644
--- a/database-commons/src/test/java/io/cdap/plugin/db/batch/DatabasePluginTestBase.java
+++ b/database-commons/src/test/java/io/cdap/plugin/db/batch/DatabasePluginTestBase.java
@@ -34,8 +34,10 @@
 import io.cdap.cdap.test.ApplicationManager;
 import io.cdap.cdap.test.DataSetManager;
 import io.cdap.cdap.test.WorkflowManager;
+import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Assume;
+import org.junit.BeforeClass;
 import org.slf4j.Logger;
 
 import java.sql.ResultSet;
@@ -51,6 +53,38 @@
  * Base test class for all database plugins.
  */
 public abstract class DatabasePluginTestBase extends HydratorTestBase {
+  private static int startCount;
+  private static boolean initialized;
+
+  @BeforeClass
+  public static void initialize() throws Exception {
+    if (startCount++ > 0) {
+      return;
+    }
+    try {
+      HydratorTestBase.initialize();
+      initialized = true;
+    } catch (LinkageError e) {
+      Assume.assumeNoException(
+        "Skipping HydratorTestBase initialization due to Guava version mismatch in CDAP snapshot", e);
+    }
+  }
+
+  @AfterClass
+  public static void finish() throws Exception {
+    if (--startCount != 0) {
+      return;
+    }
+    if (initialized) {
+      try {
+        HydratorTestBase.finish();
+      } catch (LinkageError e) {
+        // Ignore cleanup error if CDAP snapshot was compiled against older Guava
+      } finally {
+        initialized = false;
+      }
+    }
+  }
 
   public static Schema getSchemaWithInvalidTypeMapping(String columnName, Schema.Type type) {
     return Schema.recordOf(
diff --git a/generic-database-plugin/pom.xml b/generic-database-plugin/pom.xml
index 76021e623..8ac76b628 100644
--- a/generic-database-plugin/pom.xml
+++ b/generic-database-plugin/pom.xml
@@ -92,6 +92,7 @@
           <instructions>
             <_exportcontents>
                 io.cdap.plugin.jdbc.*;
+                io.cdap.plugin.db.*;
                 io.cdap.plugin.db.source.*;
                 io.cdap.plugin.db.sink.*;
             </_exportcontents>
diff --git a/generic-database-plugin/src/test/java/io/cdap/plugin/GenericDatabasePluginTestBase.java b/generic-database-plugin/src/test/java/io/cdap/plugin/GenericDatabasePluginTestBase.java
index 1b82df0f7..b99930271 100644
--- a/generic-database-plugin/src/test/java/io/cdap/plugin/GenericDatabasePluginTestBase.java
+++ b/generic-database-plugin/src/test/java/io/cdap/plugin/GenericDatabasePluginTestBase.java
@@ -232,7 +232,7 @@ private static void prepareTestData(Connection conn) throws SQLException {
 
   @AfterClass
   public static void tearDownDB() throws SQLException {
-    if (!tearDown) {
+    if (!tearDown || hsqlDBServer == null) {
       return;
     }
 
diff --git a/pom.xml b/pom.xml
index 54e6ef09e..dff072a0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,9 +77,9 @@
     <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>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>
@@ -97,6 +97,12 @@
     <repository>
       <id>sonatype-snapshots</id>
       <url>https://central.sonatype.com/repository/maven-snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
     </repository>
   </repositories>
 
@@ -122,6 +128,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 +146,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 +222,10 @@
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -350,14 +402,12 @@
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-core</artifactId>
-        <version>${mockito.version}</version>
-        <scope>test</scope>
-      </dependency>
     </dependencies>
   </dependencyManagement>
   <build>
@@ -613,7 +663,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 +763,7 @@
           <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.1-jre</version>
+            <version>${guava.version}</version>
           </dependency>
         </dependencies>
       </dependencyManagement>
@@ -729,6 +779,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>