From ca6310c13ce0fcb505fd14531f74255b063ea029 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 fixes --- amazon-redshift-plugin/pom.xml | 3 ++ aurora-mysql-plugin/pom.xml | 1 + cloudsql-mysql-plugin/pom.xml | 18 ++------ cloudsql-postgresql-plugin/pom.xml | 15 ------- generic-database-plugin/pom.xml | 1 + .../plugin/GenericDatabasePluginTestBase.java | 2 +- pom.xml | 43 +++++++++++++------ 7 files changed, 40 insertions(+), 43 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..66ce3db5c 100644 --- a/cloudsql-mysql-plugin/pom.xml +++ b/cloudsql-mysql-plugin/pom.xml @@ -82,6 +82,10 @@ mysql-plugin ${project.version} + + com.google.guava + guava + @@ -133,20 +137,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..ba14898c5 100644 --- a/cloudsql-postgresql-plugin/pom.xml +++ b/cloudsql-postgresql-plugin/pom.xml @@ -85,7 +85,6 @@ com.google.guava guava - 31.0.1-jre @@ -138,20 +137,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/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..d27971d4e 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 + @@ -387,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 @@ -613,7 +641,6 @@ src/e2e-test/java TestRunner.java - 32.1.2-jre @@ -708,16 +735,6 @@ - - - - com.google.guava - guava - 31.1-jre - - - - org.slf4j From 998e20cd35a1bb60a8f3830207f929e0a5a15b44 Mon Sep 17 00:00:00 2001 From: abhishkkumar Date: Fri, 20 Nov 2026 07:15:22 +0000 Subject: [PATCH 2/2] Tighten cdapArtifacts parent range lower bound to 6.12.0-SNAPSHOT --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d27971d4e..ba71fe22e 100644 --- a/pom.xml +++ b/pom.xml @@ -376,8 +376,8 @@ 1.1.0 - system:cdap-data-pipeline[6.11.0-SNAPSHOT,7.0.0-SNAPSHOT) - system:cdap-data-streams[6.11.0-SNAPSHOT,7.0.0-SNAPSHOT) + system:cdap-data-pipeline[6.12.0-SNAPSHOT,7.0.0-SNAPSHOT) + system:cdap-data-streams[6.12.0-SNAPSHOT,7.0.0-SNAPSHOT)