From f10f18c0422571d85e241d125a6310262fec78fb Mon Sep 17 00:00:00 2001 From: abhishkkumar Date: Tue, 13 Oct 2026 04:06:52 +0000 Subject: [PATCH 1/2] guava fixes fixes3 fixes34 fixes343 --- amazon-redshift-plugin/pom.xml | 3 + aurora-mysql-plugin/pom.xml | 1 + cloudsql-mysql-plugin/pom.xml | 25 +++--- cloudsql-postgresql-plugin/pom.xml | 22 ++---- .../db/batch/DatabasePluginTestBase.java | 34 +++++++++ generic-database-plugin/pom.xml | 1 + .../plugin/GenericDatabasePluginTestBase.java | 2 +- pom.xml | 76 ++++++++++++++++--- 8 files changed, 124 insertions(+), 40 deletions(-) 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 @@ redshift http://redshift-maven-repository.s3-website-us-east-1.amazonaws.com/release + + false + 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 @@ <_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 @@ mysql-plugin ${project.version} + + com.google.guava + guava + ${guava.version} + @@ -121,6 +126,12 @@ mysql-socket-factory-connector-j-8 1.0.10 test + + + com.google.guava + guava + + @@ -133,20 +144,6 @@ - - org.apache.felix - maven-bundle-plugin - - - <_exportcontents> - io.cdap.plugin.* - - *;inline=false;scope=compile - true - lib - - - io.cdap cdap-maven-plugin 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 @@ com.google.guava guava - 31.0.1-jre + ${guava.version} @@ -125,6 +125,12 @@ postgres-socket-factory 1.4.0 test + + + com.google.guava + guava + + @@ -138,20 +144,6 @@ - - org.apache.felix - maven-bundle-plugin - - - <_exportcontents> - io.cdap.plugin.* - - *;inline=false;scope=compile - true - lib - - - io.cdap cdap-maven-plugin 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 @@ <_exportcontents> io.cdap.plugin.jdbc.*; + io.cdap.plugin.db.*; io.cdap.plugin.db.source.*; io.cdap.plugin.db.sink.*; 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 @@ true UTF-8 - 6.11.0 + 6.12.0-SNAPSHOT 2.13.1 - 13.0.1 + 32.0.0-jre 3.3.6 2.2.4 4.13 @@ -97,6 +97,12 @@ sonatype-snapshots https://central.sonatype.com/repository/maven-snapshots + + false + + + true + @@ -122,6 +128,12 @@ cdap-api ${cdap.version} provided + + + com.google.guava + guava + + org.mockito @@ -134,35 +146,71 @@ cdap-etl-proto ${cdap.version} test + + + com.google.guava + guava + + io.cdap.cdap cdap-etl-api ${cdap.version} provided + + + com.google.guava + guava + + io.cdap.cdap cdap-data-pipeline3_2.12 ${cdap.version} test + + + com.google.guava + guava + + io.cdap.cdap hydrator-test ${cdap.version} test + + + com.google.guava + guava + + io.cdap.plugin hydrator-common ${cdap.plugin.version} + + + com.google.guava + guava + + io.cdap.cdap cdap-test ${cdap.version} test + + + com.google.guava + guava + + io.cdap.cdap @@ -174,6 +222,10 @@ asm asm + + com.google.guava + guava + @@ -350,14 +402,12 @@ javax.servlet servlet-api + + com.google.guava + guava + - - org.mockito - mockito-core - ${mockito.version} - test - @@ -613,7 +663,7 @@ src/e2e-test/java TestRunner.java - 32.1.2-jre + 32.0.0-jre @@ -713,7 +763,7 @@ com.google.guava guava - 31.1-jre + ${guava.version} @@ -729,6 +779,12 @@ cdap-e2e-framework 0.5.0-SNAPSHOT test + + + com.google.guava + guava + + From a6b971981a236b4976904fdce167a185d2a3c526 Mon Sep 17 00:00:00 2001 From: abhishkkumar Date: Wed, 18 Nov 2026 07:23:06 +0000 Subject: [PATCH 2/2] fixes --- cloudsql-mysql-plugin/pom.xml | 7 -- cloudsql-postgresql-plugin/pom.xml | 7 -- .../db/batch/DatabasePluginTestBase.java | 34 ------- pom.xml | 95 ++++++------------- 4 files changed, 28 insertions(+), 115 deletions(-) diff --git a/cloudsql-mysql-plugin/pom.xml b/cloudsql-mysql-plugin/pom.xml index 3a0c0d81d..66ce3db5c 100644 --- a/cloudsql-mysql-plugin/pom.xml +++ b/cloudsql-mysql-plugin/pom.xml @@ -85,7 +85,6 @@ com.google.guava guava - ${guava.version} @@ -126,12 +125,6 @@ mysql-socket-factory-connector-j-8 1.0.10 test - - - com.google.guava - guava - - diff --git a/cloudsql-postgresql-plugin/pom.xml b/cloudsql-postgresql-plugin/pom.xml index 32a9ad0a5..ba14898c5 100644 --- a/cloudsql-postgresql-plugin/pom.xml +++ b/cloudsql-postgresql-plugin/pom.xml @@ -85,7 +85,6 @@ com.google.guava guava - ${guava.version} @@ -125,12 +124,6 @@ postgres-socket-factory 1.4.0 test - - - com.google.guava - guava - - 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 a899de693..fa45dcee6 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,10 +34,8 @@ 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; @@ -53,38 +51,6 @@ * 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/pom.xml b/pom.xml index dff072a0f..d27971d4e 100644 --- a/pom.xml +++ b/pom.xml @@ -128,12 +128,6 @@ cdap-api ${cdap.version} provided - - - com.google.guava - guava - - org.mockito @@ -146,71 +140,35 @@ cdap-etl-proto ${cdap.version} test - - - com.google.guava - guava - - io.cdap.cdap cdap-etl-api ${cdap.version} provided - - - com.google.guava - guava - - io.cdap.cdap cdap-data-pipeline3_2.12 ${cdap.version} test - - - com.google.guava - guava - - io.cdap.cdap hydrator-test ${cdap.version} test - - - com.google.guava - guava - - io.cdap.plugin hydrator-common ${cdap.plugin.version} - - - com.google.guava - guava - - io.cdap.cdap cdap-test ${cdap.version} test - - - com.google.guava - guava - - io.cdap.cdap @@ -222,10 +180,6 @@ asm asm - - com.google.guava - guava - @@ -402,12 +356,14 @@ javax.servlet servlet-api - - com.google.guava - guava - + + org.mockito + mockito-core + ${mockito.version} + test + @@ -437,6 +393,28 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + 3.5.0 + + + enforce-upper-bound-deps + + enforce + + + + + + com.google.guava:guava + + + + + + + org.apache.maven.plugins maven-compiler-plugin @@ -663,7 +641,6 @@ src/e2e-test/java TestRunner.java - 32.0.0-jre @@ -758,16 +735,6 @@ - - - - com.google.guava - guava - ${guava.version} - - - - org.slf4j @@ -779,12 +746,6 @@ cdap-e2e-framework 0.5.0-SNAPSHOT test - - - com.google.guava - guava - -