From 257b4419152ae6de2e299ecccae5c0bf63c0bdea Mon Sep 17 00:00:00 2001 From: abhishkkumar Date: Tue, 20 Oct 2026 17:24:32 +0000 Subject: [PATCH 1/2] guava_fixes --- pom.xml | 48 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index d4db041..a302f19 100644 --- a/pom.xml +++ b/pom.xml @@ -67,6 +67,7 @@ ${project.basedir} ${project.basedir}/src/test/java/ 2.13.4.2 + 32.0.0-jre @@ -79,7 +80,7 @@ com.google.guava guava - 13.0.1 + ${guava.version} compile @@ -101,6 +102,10 @@ io.thekraken grok + + com.google.guava + guava + @@ -121,6 +126,10 @@ log4j log4j + + com.google.guava + guava + @@ -128,16 +137,34 @@ cdap-data-pipeline3_2.12 ${cdap.version} provided + + + com.google.guava + guava + + io.cdap.plugin hydrator-common ${cdap.plugin.version} + + + com.google.guava + guava + + io.cdap.plugin format-common ${cdap.plugin.version} + + + com.google.guava + guava + + org.apache.hadoop @@ -237,6 +264,10 @@ org.apache.avro avro + + com.google.guava + guava + io.netty @@ -604,6 +626,12 @@ cdap-e2e-framework 0.5.0-SNAPSHOT test + + + com.google.guava + guava + + ch.qos.logback From 8764b3154da2c3837a8a8ccb04db064b9d638ac4 Mon Sep 17 00:00:00 2001 From: abhishkkumar Date: Wed, 18 Nov 2026 08:32:32 +0000 Subject: [PATCH 2/2] Address review comments: pin Guava in dependencyManagement and add enforcer rule --- pom.xml | 69 ++++++++++++++++++++++++++------------------------------- 1 file changed, 32 insertions(+), 37 deletions(-) diff --git a/pom.xml b/pom.xml index a302f19..27717bc 100644 --- a/pom.xml +++ b/pom.xml @@ -70,6 +70,16 @@ 32.0.0-jre + + + + com.google.guava + guava + ${guava.version} + + + + com.fasterxml.jackson.core @@ -80,7 +90,6 @@ com.google.guava guava - ${guava.version} compile @@ -102,10 +111,6 @@ io.thekraken grok - - com.google.guava - guava - @@ -126,10 +131,6 @@ log4j log4j - - com.google.guava - guava - @@ -137,34 +138,16 @@ cdap-data-pipeline3_2.12 ${cdap.version} provided - - - com.google.guava - guava - - io.cdap.plugin hydrator-common ${cdap.plugin.version} - - - com.google.guava - guava - - io.cdap.plugin format-common ${cdap.plugin.version} - - - com.google.guava - guava - - org.apache.hadoop @@ -264,10 +247,6 @@ org.apache.avro avro - - com.google.guava - guava -