From 36fb39066826ad6874b377ba9a42a499346c6151 Mon Sep 17 00:00:00 2001 From: Ashutosh Chauhan Date: Tue, 21 Apr 2020 23:35:15 -0700 Subject: [PATCH] HIVE-23268 : Eliminate beanutils transitive dependency --- accumulo-handler/pom.xml | 24 ++++++++++++- beeline/pom.xml | 16 ++++++++- cli/pom.xml | 16 ++++++++- common/pom.xml | 22 ++++++++++-- contrib/pom.xml | 16 ++++++++- druid-handler/pom.xml | 6 +++- hbase-handler/pom.xml | 12 +++++-- hcatalog/core/pom.xml | 12 +++++-- hcatalog/hcatalog-pig-adapter/pom.xml | 22 ++++++++++-- hcatalog/pom.xml | 16 ++++++++- hcatalog/server-extensions/pom.xml | 16 ++++++++- hcatalog/streaming/pom.xml | 16 ++++++++- hcatalog/webhcat/java-client/pom.xml | 16 ++++++++- hcatalog/webhcat/svr/pom.xml | 6 +++- hplsql/pom.xml | 16 ++++++++- jdbc/pom.xml | 8 ++++- kafka-handler/pom.xml | 6 +++- kryo-registrator/pom.xml | 8 ++++- kudu-handler/pom.xml | 16 ++++++++- llap-client/pom.xml | 12 +++++-- llap-common/pom.xml | 12 +++++-- llap-ext-client/pom.xml | 12 +++++-- llap-server/pom.xml | 12 +++++-- llap-tez/pom.xml | 12 +++++-- metastore/pom.xml | 6 +++- ql/pom.xml | 6 +++- serde/pom.xml | 12 +++++-- service/pom.xml | 6 +++- shims/0.23/pom.xml | 34 +++++++++++++++++-- shims/common/pom.xml | 22 +++++++----- shims/scheduler/pom.xml | 14 ++++++++ standalone-metastore/metastore-common/pom.xml | 6 +++- standalone-metastore/metastore-server/pom.xml | 25 +++++++++++++- .../metastore-benchmarks/pom.xml | 8 +++++ standalone-metastore/pom.xml | 1 + storage-api/pom.xml | 4 +++ streaming/pom.xml | 16 ++++++++- upgrade-acid/pre-upgrade/pom.xml | 6 +++- 38 files changed, 443 insertions(+), 53 deletions(-) diff --git a/accumulo-handler/pom.xml b/accumulo-handler/pom.xml index 23433a5ca7..bee3eb8f50 100644 --- a/accumulo-handler/pom.xml +++ b/accumulo-handler/pom.xml @@ -36,7 +36,15 @@ org.apache.accumulo accumulo-core + + commons-beanutils + commons-beanutils-core + + commons-digester + commons-digester + + commons-collections commons-collections @@ -134,7 +142,21 @@ hadoop-common ${hadoop.version} true - + + + org.slf4j + slf4j-log4j12 + + + commons-beanutils + commons-beanutils + + + commons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-core diff --git a/beeline/pom.xml b/beeline/pom.xml index a5a1e42896..bb627f2f63 100644 --- a/beeline/pom.xml +++ b/beeline/pom.xml @@ -81,7 +81,21 @@ hadoop-common ${hadoop.version} true - + + + commons-beanutils + commons-beanutils + + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + + + org.apache.thrift libthrift diff --git a/cli/pom.xml b/cli/pom.xml index 79fa973bcc..eca0282670 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -97,7 +97,21 @@ hadoop-common ${hadoop.version} true - + + + commons-beanutils + commons-beanutils + + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-core diff --git a/common/pom.xml b/common/pom.xml index 9cc9d6be95..74586e5b1e 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -134,7 +134,11 @@ ${hadoop.version} true - + + commons-beanutils + commons-beanutils + + commons-collections commons-collections @@ -244,7 +248,21 @@ com.github.joshelser dropwizard-metrics-hadoop-metrics2-reporter ${dropwizard-metrics-hadoop-metrics2-reporter.version} - + + + org.slf4j + slf4j-log4j12 + + + commons-beanutils + commons-beanutils + + + commons-logging + commons-logging + + + javolution javolution diff --git a/contrib/pom.xml b/contrib/pom.xml index ee2013fdbd..4e28cb53e3 100644 --- a/contrib/pom.xml +++ b/contrib/pom.xml @@ -60,7 +60,21 @@ hadoop-common ${hadoop.version} true - + + + commons-beanutils + commons-beanutils + + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-core diff --git a/druid-handler/pom.xml b/druid-handler/pom.xml index 18dfca02f9..7544bd69eb 100644 --- a/druid-handler/pom.xml +++ b/druid-handler/pom.xml @@ -213,7 +213,11 @@ com.google.guava guava - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging diff --git a/hbase-handler/pom.xml b/hbase-handler/pom.xml index da24059f32..233b8b20c5 100644 --- a/hbase-handler/pom.xml +++ b/hbase-handler/pom.xml @@ -50,7 +50,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging @@ -217,7 +221,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging diff --git a/hcatalog/core/pom.xml b/hcatalog/core/pom.xml index 493abbb301..920547e897 100644 --- a/hcatalog/core/pom.xml +++ b/hcatalog/core/pom.xml @@ -121,7 +121,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging @@ -171,7 +175,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging diff --git a/hcatalog/hcatalog-pig-adapter/pom.xml b/hcatalog/hcatalog-pig-adapter/pom.xml index bc8bfba646..a1b6287fbc 100644 --- a/hcatalog/hcatalog-pig-adapter/pom.xml +++ b/hcatalog/hcatalog-pig-adapter/pom.xml @@ -50,7 +50,21 @@ org.apache.hadoop hadoop-common ${hadoop.version} - + + + org.slf4j + slf4j-log4j12 + + + commons-beanutils + commons-beanutils + + + commons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-jobclient @@ -155,7 +169,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging diff --git a/hcatalog/pom.xml b/hcatalog/pom.xml index ae278bc7d1..bae746688b 100644 --- a/hcatalog/pom.xml +++ b/hcatalog/pom.xml @@ -52,7 +52,21 @@ hadoop-common ${hadoop.version} test - + + + commons-beanutils + commons-beanutils + + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-core diff --git a/hcatalog/server-extensions/pom.xml b/hcatalog/server-extensions/pom.xml index 9bc28f2f6c..9e4ddaa007 100644 --- a/hcatalog/server-extensions/pom.xml +++ b/hcatalog/server-extensions/pom.xml @@ -70,7 +70,21 @@ org.apache.hadoop hadoop-common ${hadoop.version} - + + + commons-beanutils + commons-beanutils + + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + + + org.apache.hive.hcatalog diff --git a/hcatalog/streaming/pom.xml b/hcatalog/streaming/pom.xml index ae451c48f3..af9dc598e9 100644 --- a/hcatalog/streaming/pom.xml +++ b/hcatalog/streaming/pom.xml @@ -72,7 +72,21 @@ hadoop-common true ${hadoop.version} - + + + commons-beanutils + commons-beanutils + + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-core diff --git a/hcatalog/webhcat/java-client/pom.xml b/hcatalog/webhcat/java-client/pom.xml index 66ebfb5375..c3701ade7f 100644 --- a/hcatalog/webhcat/java-client/pom.xml +++ b/hcatalog/webhcat/java-client/pom.xml @@ -60,7 +60,21 @@ org.apache.hadoop hadoop-common ${hadoop.version} - + + + commons-beanutils + commons-beanutils + + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-core diff --git a/hcatalog/webhcat/svr/pom.xml b/hcatalog/webhcat/svr/pom.xml index bd1f3334c7..25703c5e83 100644 --- a/hcatalog/webhcat/svr/pom.xml +++ b/hcatalog/webhcat/svr/pom.xml @@ -166,7 +166,11 @@ hadoop-common ${hadoop.version} - + + commons-beanutils + commons-beanutils + + org.eclipse.jetty jetty diff --git a/hplsql/pom.xml b/hplsql/pom.xml index 2642c6a3ea..fc4a2d48cb 100644 --- a/hplsql/pom.xml +++ b/hplsql/pom.xml @@ -63,7 +63,21 @@ hadoop-common ${hadoop.version} true - + + + org.slf4j + slf4j-log4j12 + + + commons-beanutils + commons-beanutils + + + commons-logging + commons-logging + + + org.apache.hadoop hadoop-hdfs-client diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 0fa27d5062..971ef0dc5c 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -107,7 +107,13 @@ org.apache.hadoop hadoop-common ${hadoop.version} - true + + + commons-beanutils + commons-beanutils + + + true diff --git a/kafka-handler/pom.xml b/kafka-handler/pom.xml index 0ad397366a..7614386a2b 100644 --- a/kafka-handler/pom.xml +++ b/kafka-handler/pom.xml @@ -64,7 +64,11 @@ org.apache.hadoop hadoop-common - + + commons-beanutils + commons-beanutils + + org.slf4j slf4j-api diff --git a/kryo-registrator/pom.xml b/kryo-registrator/pom.xml index ea2eb6508c..53da37a624 100644 --- a/kryo-registrator/pom.xml +++ b/kryo-registrator/pom.xml @@ -37,7 +37,13 @@ hive-exec ${project.version} true - + + + commons-beanutils + commons-beanutils-core + + + org.apache.spark spark-core_${scala.binary.version} diff --git a/kudu-handler/pom.xml b/kudu-handler/pom.xml index c4661fac47..88bf1f6304 100644 --- a/kudu-handler/pom.xml +++ b/kudu-handler/pom.xml @@ -54,7 +54,21 @@ ${hadoop.version} provided true - + + + org.slf4j + slf4j-log4j12 + + + commons-beanutils + commons-beanutils + + + commons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-core diff --git a/llap-client/pom.xml b/llap-client/pom.xml index df25bf6709..a5bbb51e8c 100644 --- a/llap-client/pom.xml +++ b/llap-client/pom.xml @@ -82,7 +82,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging @@ -118,7 +122,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging diff --git a/llap-common/pom.xml b/llap-common/pom.xml index fb6e1ce995..6f53f6d428 100644 --- a/llap-common/pom.xml +++ b/llap-common/pom.xml @@ -61,7 +61,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging @@ -143,7 +147,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging diff --git a/llap-ext-client/pom.xml b/llap-ext-client/pom.xml index cfc3468342..a7b981039b 100644 --- a/llap-ext-client/pom.xml +++ b/llap-ext-client/pom.xml @@ -61,7 +61,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging @@ -136,7 +140,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging diff --git a/llap-server/pom.xml b/llap-server/pom.xml index 3d4e3da45b..0baeddb196 100644 --- a/llap-server/pom.xml +++ b/llap-server/pom.xml @@ -109,7 +109,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging @@ -272,7 +276,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging diff --git a/llap-tez/pom.xml b/llap-tez/pom.xml index ec42e23d8c..888bf8ec7a 100644 --- a/llap-tez/pom.xml +++ b/llap-tez/pom.xml @@ -82,7 +82,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging @@ -199,7 +203,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging diff --git a/metastore/pom.xml b/metastore/pom.xml index c82dc2621a..cca56a57f6 100644 --- a/metastore/pom.xml +++ b/metastore/pom.xml @@ -127,7 +127,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging diff --git a/ql/pom.xml b/ql/pom.xml index a0e77a1d32..f601e7ccb0 100644 --- a/ql/pom.xml +++ b/ql/pom.xml @@ -193,7 +193,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging diff --git a/serde/pom.xml b/serde/pom.xml index c4120a039c..bf68be84b9 100644 --- a/serde/pom.xml +++ b/serde/pom.xml @@ -111,7 +111,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging @@ -154,7 +158,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging diff --git a/service/pom.xml b/service/pom.xml index 04c9a299c7..36299f822b 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -159,7 +159,11 @@ ${hadoop.version} true - + + commons-beanutils + commons-beanutils + + commons-collections commons-collections diff --git a/shims/0.23/pom.xml b/shims/0.23/pom.xml index a5d680e5df..fe03bb2108 100644 --- a/shims/0.23/pom.xml +++ b/shims/0.23/pom.xml @@ -51,7 +51,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging @@ -163,7 +167,21 @@ org.apache.hadoop hadoop-yarn-common ${hadoop.version} - true + + + commons-beanutils + commons-beanutils + + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + + + true org.apache.hadoop @@ -176,6 +194,18 @@ hadoop-yarn-server-resourcemanager ${hadoop.version} + + commons-beanutils + commons-beanutils + + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + javax.servlet servlet-api diff --git a/shims/common/pom.xml b/shims/common/pom.xml index 49d507b19d..e2a47111cd 100644 --- a/shims/common/pom.xml +++ b/shims/common/pom.xml @@ -50,16 +50,20 @@ hadoop-client ${hadoop.version} true - - - org.slf4j - slf4j-log4j12 - - - commons-logging - commons-logging + + + commons-beanutils + commons-beanutils - + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + + org.apache.thrift diff --git a/shims/scheduler/pom.xml b/shims/scheduler/pom.xml index 48b20970ef..8c31a52086 100644 --- a/shims/scheduler/pom.xml +++ b/shims/scheduler/pom.xml @@ -46,6 +46,20 @@ hadoop-common ${hadoop.version} true + + + commons-beanutils + commons-beanutils + + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + + org.apache.hadoop diff --git a/standalone-metastore/metastore-common/pom.xml b/standalone-metastore/metastore-common/pom.xml index 69cdca44db..ab269156a7 100644 --- a/standalone-metastore/metastore-common/pom.xml +++ b/standalone-metastore/metastore-common/pom.xml @@ -109,7 +109,11 @@ hadoop-common true - + + commons-beanutils + commons-beanutils + + org.slf4j slf4j-log4j12 diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml index e492ce1070..84b43c0f68 100644 --- a/standalone-metastore/metastore-server/pom.xml +++ b/standalone-metastore/metastore-server/pom.xml @@ -111,7 +111,11 @@ org.slf4j slf4j-log4j12 - + + commons-beanutils + commons-beanutils + + commons-logging commons-logging @@ -175,6 +179,25 @@ + + commons-beanutils + commons-beanutils + ${beanutils.version} + + + commons-collections + commons-collections-testframework + + + junit + junit + + + commons-logging + commons-logging + + + org.apache.hive diff --git a/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml b/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml index 534583dc43..06a4d8d83b 100644 --- a/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml +++ b/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml @@ -98,7 +98,15 @@ maven-jxr-plugin 2.5 + + org.apache.velocity + velocity-tools + + commons-validator + commons-validator + + org.codehaus.plexus plexus-utils diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml index 516ce4a40a..26e82677eb 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -99,6 +99,7 @@ 2.14.6 4.0.4 2.7.0-SNAPSHOT + 1.9.4 1.3 4.2.0 3.5.5 diff --git a/storage-api/pom.xml b/storage-api/pom.xml index 39b23b0af8..de70477432 100644 --- a/storage-api/pom.xml +++ b/storage-api/pom.xml @@ -47,6 +47,10 @@ ${hadoop.version} provided + + commons-beanutils + commons-beanutils + com.google.guava guava diff --git a/streaming/pom.xml b/streaming/pom.xml index 22fe61995d..54edcca612 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -60,7 +60,21 @@ hadoop-common true ${hadoop.version} - + + + commons-beanutils + commons-beanutils + + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-core diff --git a/upgrade-acid/pre-upgrade/pom.xml b/upgrade-acid/pre-upgrade/pom.xml index 3abe59675d..641f4b69ee 100644 --- a/upgrade-acid/pre-upgrade/pom.xml +++ b/upgrade-acid/pre-upgrade/pom.xml @@ -103,7 +103,11 @@ ${hdp.hadoop.version} provided - + + commons-configuration + commons-configuration + + org.apache.zookeeper zookeeper -- 2.17.2 (Apple Git-113)