Skip to content

[OPS] shaded protobuf update #1036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vladislav-sidorovich merged 6 commits into from
Nov 24, 2025
Merged

[OPS] shaded protobuf update #1036

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c65895e
Update hadoop-common to 3.4.2
vladislav-sidorovich Nov 23, 2025
3ef0e65
uncomment source plugin
vladislav-sidorovich Nov 23, 2025
cc7ae3d
Fix comments
vladislav-sidorovich Nov 23, 2025
72f54be
Delete apache commons because it was deleted from hadoop-commons 3.4.2
vladislav-sidorovich Nov 23, 2025
df8e042
Updated shaded proto
vladislav-sidorovich Nov 24, 2025
ac3422e
Merge branch 'main' into ops/shaded-protobuf
vladislav-sidorovich Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dumper/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ dependencies {
exclude group: "javax.servlet.jsp", module: "jsp-api"
}
//Overrides for hadoop-common transient deps
implementation libs.commons.beanutils // explicit version for vulnerabilities update
implementation libs.jetty.server // explicit version for vulnerabilities update
implementation libs.netty.handler // explicit version for vulnerabilities update
implementation libs.dnsjava // explicit version for vulnerabilities update
Expand Down
22 changes: 6 additions & 16 deletions dumper/app/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,9 @@ com.sun.jersey:jersey-servlet:1.19.4=compileClasspath,runtimeClasspath,testCompi
com.sun.xml.bind:jaxb-impl:2.2.3-1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.swrve:rate-limited-logger:2.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.zaxxer:HikariCP:4.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
commons-beanutils:commons-beanutils:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
commons-cli:commons-cli:1.5.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
commons-codec:commons-codec:1.17.1=testFixturesCompileClasspath
commons-codec:commons-codec:1.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
commons-collections:commons-collections:3.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
commons-io:commons-io:2.19.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
commons-net:commons-net:3.9.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
dnsjava:dnsjava:3.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
Expand Down Expand Up @@ -189,31 +187,24 @@ org.apache.curator:curator-client:5.2.0=compileClasspath,runtimeClasspath,testCo
org.apache.curator:curator-framework:5.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.curator:curator-recipes:5.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_21:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.hadoop:hadoop-annotations:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.hadoop:hadoop-auth:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.hadoop:hadoop-common:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.hadoop:hadoop-hdfs-client:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_25:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.hadoop:hadoop-annotations:3.4.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.hadoop:hadoop-auth:3.4.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.hadoop:hadoop-common:3.4.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.hadoop:hadoop-hdfs-client:3.4.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.commons:commons-collections4:4.4=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.httpcomponents.client5:httpclient5:5.4.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.httpcomponents.core5:httpcore5-h2:5.3.4=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.httpcomponents.core5:httpcore5:5.3.4=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.kerby:kerb-admin:2.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.kerby:kerb-client:2.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.kerby:kerb-common:2.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.kerby:kerb-core:2.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.kerby:kerb-crypto:2.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.kerby:kerb-identity:2.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.kerby:kerb-server:2.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.kerby:kerb-simplekdc:2.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.kerby:kerb-util:2.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.kerby:kerby-asn1:2.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.kerby:kerby-config:2.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.kerby:kerby-pkix:2.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.kerby:kerby-util:2.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.kerby:kerby-xdr:2.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.kerby:token-provider:2.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.oozie:oozie-client:5.2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.thrift:libthrift:0.20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.apache.yetus:audience-annotations:0.12.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
Expand Down Expand Up @@ -246,7 +237,6 @@ org.jacoco:org.jacoco.agent:0.8.11=jacocoAgent,jacocoAnt
org.jacoco:org.jacoco.ant:0.8.11=jacocoAnt
org.jacoco:org.jacoco.core:0.8.11=jacocoAnt
org.jacoco:org.jacoco.report:0.8.11=jacocoAnt
org.jline:jline:3.22.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.json:json:20250517=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-api:5.9.1=testRuntimeClasspath
Expand Down
6 changes: 4 additions & 2 deletions .../edwmigration/dumper/application/dumper/connector/hadoop/oozie/AbstractOozieJobsTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,15 @@
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVPrinter;
import org.apache.oozie.client.OozieClient;
import org.apache.oozie.client.OozieClientException;
import org.apache.oozie.client.XOozieClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanWrapper;
import org.springframework.beans.BeanWrapperImpl;

public abstract class AbstractOozieJobsTask<J> extends AbstractTask<Void> {

Expand Down Expand Up @@ -156,8 +157,9 @@ private static String toISO(ZonedDateTime dateTime) {

private static Object[] toCSVRecord(Object job, ImmutableList<String> header) throws Exception {
Object[] record = new Object[header.size()];
BeanWrapper jobObjectWrapper = new BeanWrapperImpl(job);
for (int i = 0; i < header.size(); i++) {
record[i] = PropertyUtils.getProperty(job, header.get(i));
record[i] = jobObjectWrapper.getPropertyValue(header.get(i));
if (record[i] != null && record[i] instanceof Date) {
// avoid date formats complexity and use milliseconds
record[i] = ((Date) record[i]).getTime();
Expand Down
5 changes: 4 additions & 1 deletion dumper/lib-ext-hive-metastore/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,13 @@ dependencies {
hive312RuntimeOnly libs.hadoop.common

//Overrides for hadoop-common transient deps
hive312RuntimeOnly libs.commons.beanutils // explicit version for vulnerabilities update
hive312RuntimeOnly libs.netty.handler // explicit version for vulnerabilities update
hive312RuntimeOnly libs.dnsjava // explicit version for vulnerabilities update
hive312RuntimeOnly libs.nimbus.jose.jwt // explicit version for vulnerabilities update
hive312RuntimeOnly libs.zookeeper // explicit version for vulnerabilities update
hive312RuntimeOnly libs.common.configuration2 // explicit version for vulnerabilities update
hive312RuntimeOnly libs.bouncycastle // explicit version for vulnerabilities update
hive312RuntimeOnly libs.hadoop.shaded.protobuf // explicit version for vulnerabilities update

// For HiveServer2
hive312RuntimeOnly libs.tez.common
Expand Down Expand Up @@ -112,6 +113,8 @@ shadowJar {
exclude(dependency('org.datanucleus:.*')) // can't be safely shadowed
}

exclude 'META-INF/versions/**' // Exclude the specific Java 8+ deps versions

relocate 'org.apache.thrift', 'shadow.org.apache.thrift' // this is the whole point of doing this
relocate 'com.google.common', 'shadow.com.google.common'
relocate 'org.junit', 'shadow.org.junit'
Expand Down
19 changes: 5 additions & 14 deletions dumper/lib-ext-hive-metastore/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ com.yahoo.datasketches:memory:0.9.0=hive312RuntimeClasspath
com.yahoo.datasketches:sketches-core:0.9.0=hive312RuntimeClasspath
com.zaxxer:HikariCP-java7:2.4.12=hive312RuntimeClasspath
com.zaxxer:HikariCP:2.6.1=hive312RuntimeClasspath
commons-beanutils:commons-beanutils:1.11.0=hive312RuntimeClasspath
commons-cli:commons-cli:1.5.0=hive312RuntimeClasspath
commons-codec:commons-codec:1.17.0=hive312RuntimeClasspath
commons-collections:commons-collections:3.2.2=hive312RuntimeClasspath
Expand Down Expand Up @@ -142,11 +141,11 @@ org.apache.curator:curator-recipes:5.2.0=hive312RuntimeClasspath
org.apache.derby:derby:10.14.1.0=hive312RuntimeClasspath
org.apache.geronimo.specs:geronimo-jcache_1.0_spec:1.0-alpha-1=hive312RuntimeClasspath
org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.2.0=hive312RuntimeClasspath
org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_21:1.2.0=hive312RuntimeClasspath
org.apache.hadoop:hadoop-annotations:3.4.0=hive312RuntimeClasspath
org.apache.hadoop:hadoop-auth:3.4.0=hive312RuntimeClasspath
org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_25:1.5.0=hive312RuntimeClasspath
org.apache.hadoop:hadoop-annotations:3.4.2=hive312RuntimeClasspath
org.apache.hadoop:hadoop-auth:3.4.2=hive312RuntimeClasspath
org.apache.hadoop:hadoop-client:2.7.1=hive312RuntimeClasspath
org.apache.hadoop:hadoop-common:3.4.0=hive312RuntimeClasspath
org.apache.hadoop:hadoop-common:3.4.2=hive312RuntimeClasspath
org.apache.hadoop:hadoop-distcp:2.7.1=hive312RuntimeClasspath
org.apache.hadoop:hadoop-hdfs:2.7.2=hive312RuntimeClasspath
org.apache.hadoop:hadoop-mapreduce-client-app:2.7.1=hive312RuntimeClasspath
Expand Down Expand Up @@ -207,21 +206,13 @@ org.apache.httpcomponents.core5:httpcore5:5.2=runtimeClasspath,testFixturesRunti
org.apache.httpcomponents:httpclient:4.5.13=hive312RuntimeClasspath
org.apache.httpcomponents:httpcore:4.4.13=hive312RuntimeClasspath
org.apache.ivy:ivy:2.4.0=hive312RuntimeClasspath
org.apache.kerby:kerb-admin:2.0.3=hive312RuntimeClasspath
org.apache.kerby:kerb-client:2.0.3=hive312RuntimeClasspath
org.apache.kerby:kerb-common:2.0.3=hive312RuntimeClasspath
org.apache.kerby:kerb-core:2.0.3=hive312RuntimeClasspath
org.apache.kerby:kerb-crypto:2.0.3=hive312RuntimeClasspath
org.apache.kerby:kerb-identity:2.0.3=hive312RuntimeClasspath
org.apache.kerby:kerb-server:2.0.3=hive312RuntimeClasspath
org.apache.kerby:kerb-simplekdc:2.0.3=hive312RuntimeClasspath
org.apache.kerby:kerb-util:2.0.3=hive312RuntimeClasspath
org.apache.kerby:kerby-asn1:2.0.3=hive312RuntimeClasspath
org.apache.kerby:kerby-config:2.0.3=hive312RuntimeClasspath
org.apache.kerby:kerby-pkix:2.0.3=hive312RuntimeClasspath
org.apache.kerby:kerby-util:2.0.3=hive312RuntimeClasspath
org.apache.kerby:kerby-xdr:2.0.3=hive312RuntimeClasspath
org.apache.kerby:token-provider:2.0.3=hive312RuntimeClasspath
org.apache.logging.log4j:log4j-1.2-api:2.17.1=hive312RuntimeClasspath
org.apache.logging.log4j:log4j-api:2.18.0=hive312RuntimeClasspath
org.apache.logging.log4j:log4j-core:2.18.0=hive312RuntimeClasspath
Expand All @@ -242,6 +233,7 @@ org.apache.thrift:libthrift:0.9.3=hive312RuntimeClasspath
org.apache.yetus:audience-annotations:0.12.0=hive312RuntimeClasspath
org.apache.zookeeper:zookeeper-jute:3.9.4=hive312RuntimeClasspath
org.apache.zookeeper:zookeeper:3.9.4=hive312RuntimeClasspath
org.bouncycastle:bcprov-jdk18on:1.82=hive312RuntimeClasspath
org.checkerframework:checker-qual:2.5.2=hive312RuntimeClasspath
org.checkerframework:checker-qual:3.51.0=annotationProcessor,testAnnotationProcessor,testFixturesAnnotationProcessor
org.checkerframework:checker-qual:3.51.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
Expand Down Expand Up @@ -277,7 +269,6 @@ org.glassfish:javax.el:3.0.1-b12=hive312RuntimeClasspath
org.hamcrest:hamcrest-core:1.3=hive312RuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.jamon:jamon-runtime:2.4.1=hive312RuntimeClasspath
org.javassist:javassist:3.20.0-GA=hive312RuntimeClasspath
org.jline:jline:3.22.0=hive312RuntimeClasspath
org.jruby.jcodings:jcodings:1.0.18=hive312RuntimeClasspath
org.jruby.joni:joni:2.1.11=hive312RuntimeClasspath
org.mortbay.jetty:jetty-util:6.1.26=hive312RuntimeClasspath
Expand Down
5 changes: 2 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ google-cloud-nio = "0.127.30"
gradle-info-plugin = "11.4.1"
gradle-license-report = "2.8"
guava = "32.1.2-jre"
hadoop = "3.4.0"
hadoop = "3.4.2"
hikaricp = "4.0.3"
hive = "3.1.3"
httpclient5 = "5.4.3"
Expand Down Expand Up @@ -71,7 +71,6 @@ oozie-client = "5.2.1"
amazon = "2.31.16"
cloudrun = "0.60.0"
jna = "5.17.0"
commons-beanutils = "1.11.0"
jetty-server = "9.4.58.v20250814"
netty-handler = "4.1.127.Final"
dnsjava = "3.6.3"
Expand Down Expand Up @@ -124,7 +123,6 @@ bouncycastle = { module = "org.bouncycastle:bcprov-jdk18on", version = "1.82" }
common-configuration2 = { module = "org.apache.commons:commons-configuration2", version.ref = "common-configuration2" }
nimbus-jose-jwt = { module = "com.nimbusds:nimbus-jose-jwt", version.ref = "nimbus-jose-jwt" }
dnsjava = { module = "dnsjava:dnsjava", version.ref = "dnsjava" }
commons-beanutils = { module = "commons-beanutils:commons-beanutils", version.ref = "commons-beanutils" }
jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "jetty-server" }
netty-handler = { module = "io.netty:netty-handler", version.ref = "netty-handler" }
hadoop-hdfs-client = { module = "org.apache.hadoop:hadoop-hdfs-client", version.ref = "hadoop" }
Expand Down Expand Up @@ -190,6 +188,7 @@ oozie-client = { group = "org.apache.oozie", name = "oozie-client", version.ref
xerces = { module = "xerces:xercesImpl", version.ref = "xerces"}
jna = { group = "net.java.dev.jna", "name" = "jna", version.ref = "jna"}
zookeeper = { module = "org.apache.zookeeper:zookeeper", version.ref = "zookeeper"}
hadoop-shaded-protobuf = { module = "org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_25", version = "1.5.0"}

[plugins]
ben-manes-versions = { id = "com.github.ben-manes.versions", version.ref = "ben-manes-versions-plugin" }
Expand Down