Skip to content

Commit c6050ca

Browse files
Delete apache commons because it was deleted from hadoop-commons 3.4.2
1 parent 969eebc commit c6050ca

File tree

6 files changed

+4
-9
lines changed

6 files changed

+4
-9
lines changed

dumper/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ dependencies {
7171
exclude group: "javax.servlet.jsp", module: "jsp-api"
7272
}
7373
//Overrides for hadoop-common transient deps
74-
implementation libs.commons.beanutils // explicit version for vulnerabilities update
7574
implementation libs.jetty.server // explicit version for vulnerabilities update
7675
implementation libs.netty.handler // explicit version for vulnerabilities update
7776
implementation libs.dnsjava // explicit version for vulnerabilities update

dumper/app/gradle.lockfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,9 @@ com.sun.jersey:jersey-servlet:1.19.4=compileClasspath,runtimeClasspath,testCompi
9797
com.sun.xml.bind:jaxb-impl:2.2.3-1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
9898
com.swrve:rate-limited-logger:2.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
9999
com.zaxxer:HikariCP:4.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
100-
commons-beanutils:commons-beanutils:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
101100
commons-cli:commons-cli:1.5.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
102101
commons-codec:commons-codec:1.17.1=testFixturesCompileClasspath
103102
commons-codec:commons-codec:1.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
104-
commons-collections:commons-collections:3.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
105103
commons-io:commons-io:2.19.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
106104
commons-net:commons-net:3.9.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
107105
dnsjava:dnsjava:3.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath

dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/hadoop/oozie/AbstractOozieJobsTask.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,15 @@
3535
import javax.annotation.CheckForNull;
3636
import javax.annotation.Nonnull;
3737
import javax.annotation.Nullable;
38-
import org.apache.commons.beanutils.PropertyUtils;
3938
import org.apache.commons.csv.CSVFormat;
4039
import org.apache.commons.csv.CSVPrinter;
4140
import org.apache.oozie.client.OozieClient;
4241
import org.apache.oozie.client.OozieClientException;
4342
import org.apache.oozie.client.XOozieClient;
4443
import org.slf4j.Logger;
4544
import org.slf4j.LoggerFactory;
45+
import org.springframework.beans.BeanWrapper;
46+
import org.springframework.beans.BeanWrapperImpl;
4647

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

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

157158
private static Object[] toCSVRecord(Object job, ImmutableList<String> header) throws Exception {
158159
Object[] record = new Object[header.size()];
160+
BeanWrapper jobObjectWrapper = new BeanWrapperImpl(job);
159161
for (int i = 0; i < header.size(); i++) {
160-
record[i] = PropertyUtils.getProperty(job, header.get(i));
162+
record[i] = jobObjectWrapper.getPropertyValue(header.get(i));
161163
if (record[i] != null && record[i] instanceof Date) {
162164
// avoid date formats complexity and use milliseconds
163165
record[i] = ((Date) record[i]).getTime();

dumper/lib-ext-hive-metastore/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ dependencies {
6060
hive312RuntimeOnly libs.hadoop.common
6161

6262
//Overrides for hadoop-common transient deps
63-
hive312RuntimeOnly libs.commons.beanutils // explicit version for vulnerabilities update
6463
hive312RuntimeOnly libs.netty.handler // explicit version for vulnerabilities update
6564
hive312RuntimeOnly libs.dnsjava // explicit version for vulnerabilities update
6665
hive312RuntimeOnly libs.nimbus.jose.jwt // explicit version for vulnerabilities update

dumper/lib-ext-hive-metastore/gradle.lockfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ com.yahoo.datasketches:memory:0.9.0=hive312RuntimeClasspath
6262
com.yahoo.datasketches:sketches-core:0.9.0=hive312RuntimeClasspath
6363
com.zaxxer:HikariCP-java7:2.4.12=hive312RuntimeClasspath
6464
com.zaxxer:HikariCP:2.6.1=hive312RuntimeClasspath
65-
commons-beanutils:commons-beanutils:1.11.0=hive312RuntimeClasspath
6665
commons-cli:commons-cli:1.5.0=hive312RuntimeClasspath
6766
commons-codec:commons-codec:1.17.0=hive312RuntimeClasspath
6867
commons-collections:commons-collections:3.2.2=hive312RuntimeClasspath

gradle/libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ oozie-client = "5.2.1"
7171
amazon = "2.31.16"
7272
cloudrun = "0.60.0"
7373
jna = "5.17.0"
74-
commons-beanutils = "1.11.0"
7574
jetty-server = "9.4.58.v20250814"
7675
netty-handler = "4.1.127.Final"
7776
dnsjava = "3.6.3"
@@ -124,7 +123,6 @@ bouncycastle = { module = "org.bouncycastle:bcprov-jdk18on", version = "1.82" }
124123
common-configuration2 = { module = "org.apache.commons:commons-configuration2", version.ref = "common-configuration2" }
125124
nimbus-jose-jwt = { module = "com.nimbusds:nimbus-jose-jwt", version.ref = "nimbus-jose-jwt" }
126125
dnsjava = { module = "dnsjava:dnsjava", version.ref = "dnsjava" }
127-
commons-beanutils = { module = "commons-beanutils:commons-beanutils", version.ref = "commons-beanutils" }
128126
jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "jetty-server" }
129127
netty-handler = { module = "io.netty:netty-handler", version.ref = "netty-handler" }
130128
hadoop-hdfs-client = { module = "org.apache.hadoop:hadoop-hdfs-client", version.ref = "hadoop" }

0 commit comments

Comments
 (0)