From 66b72406bd8bed28ca32c75e07fc2b682500e92b Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Tue, 8 Mar 2022 13:57:04 +0530 Subject: [PATCH] HADOOP-18131. Upgrade maven enforcer plugin and relevant dependencies (#4000) Reviewed-by: Akira Ajisaka Reviewed-by: Wei-Chiu Chuang Signed-off-by: Takanobu Asanuma --- .../hadoop-client-check-invariants/pom.xml | 2 +- .../pom.xml | 2 +- .../hadoop-client-integration-tests/pom.xml | 6 +++ .../hadoop-client-minicluster/pom.xml | 22 ++++++-- .../hadoop-cloud-storage/pom.xml | 4 ++ .../hadoop-huaweicloud/pom.xml | 12 +++-- hadoop-common-project/hadoop-common/pom.xml | 16 ++++++ .../hadoop-hdfs-client/pom.xml | 4 ++ hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml | 6 +++ .../hadoop-mapreduce-client-app/pom.xml | 6 +++ .../hadoop-mapreduce-client-core/pom.xml | 6 +++ .../hadoop-mapreduce-client-hs/pom.xml | 6 +++ .../hadoop-mapreduce-client-jobclient/pom.xml | 6 +++ .../hadoop-mapreduce-client/pom.xml | 10 ++++ .../hadoop-mapreduce-examples/pom.xml | 6 +++ hadoop-mapreduce-project/pom.xml | 4 ++ hadoop-maven-plugins/pom.xml | 18 +++++++ hadoop-minicluster/pom.xml | 6 +++ hadoop-project/pom.xml | 12 +++++ hadoop-tools/hadoop-aliyun/pom.xml | 6 +++ hadoop-tools/hadoop-archive-logs/pom.xml | 6 +++ hadoop-tools/hadoop-archives/pom.xml | 6 +++ hadoop-tools/hadoop-aws/pom.xml | 16 ++++++ hadoop-tools/hadoop-datajoin/pom.xml | 6 +++ hadoop-tools/hadoop-distcp/pom.xml | 6 +++ .../hadoop-dynamometer-infra/pom.xml | 6 +++ hadoop-tools/hadoop-extras/pom.xml | 16 ++++++ .../hadoop-federation-balance/pom.xml | 6 +++ hadoop-tools/hadoop-fs2img/pom.xml | 6 +++ hadoop-tools/hadoop-gridmix/pom.xml | 6 +++ hadoop-tools/hadoop-openstack/pom.xml | 6 +++ hadoop-tools/hadoop-rumen/pom.xml | 6 +++ hadoop-tools/hadoop-streaming/pom.xml | 6 +++ hadoop-tools/hadoop-tools-dist/pom.xml | 6 +++ .../pom.xml | 12 +++++ .../hadoop-yarn-services-core/pom.xml | 12 +++++ .../hadoop-yarn/hadoop-yarn-client/pom.xml | 6 +++ .../hadoop-yarn-server-common/pom.xml | 6 +++ .../pom.xml | 12 +++++ .../pom.xml | 6 +++ pom.xml | 51 +++++++++---------- 41 files changed, 332 insertions(+), 37 deletions(-) diff --git a/hadoop-client-modules/hadoop-client-check-invariants/pom.xml b/hadoop-client-modules/hadoop-client-check-invariants/pom.xml index 9d4bce1fddc..b1c00678406 100644 --- a/hadoop-client-modules/hadoop-client-check-invariants/pom.xml +++ b/hadoop-client-modules/hadoop-client-check-invariants/pom.xml @@ -56,7 +56,7 @@ org.codehaus.mojo extra-enforcer-rules - 1.0-beta-3 + 1.5.1 diff --git a/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml b/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml index 635250ec1ae..0e576ac6f06 100644 --- a/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml +++ b/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml @@ -60,7 +60,7 @@ org.codehaus.mojo extra-enforcer-rules - 1.0-beta-3 + 1.5.1 diff --git a/hadoop-client-modules/hadoop-client-integration-tests/pom.xml b/hadoop-client-modules/hadoop-client-integration-tests/pom.xml index 967782163f7..ba593ebd1b4 100644 --- a/hadoop-client-modules/hadoop-client-integration-tests/pom.xml +++ b/hadoop-client-modules/hadoop-client-integration-tests/pom.xml @@ -184,6 +184,12 @@ hadoop-hdfs test test-jar + + + org.ow2.asm + asm-commons + + org.apache.hadoop diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml index 2a0a5c19230..d70198ac428 100644 --- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml +++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml @@ -332,6 +332,10 @@ org.apache.hadoop.thirdparty hadoop-shaded-guava + + org.ow2.asm + asm-commons + - com.sun.jersey - jersey-core + com.sun.jersey + jersey-core true @@ -451,9 +455,19 @@ true - com.sun.jersey - jersey-servlet + com.sun.jersey + jersey-servlet true + + + javax.servlet + servlet-api + + + javax.enterprise + cdi-api + + diff --git a/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml b/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml index a8f45a7f3a2..33d3f957817 100644 --- a/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml +++ b/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml @@ -101,6 +101,10 @@ org.apache.zookeeper zookeeper + + org.projectlombok + lombok + diff --git a/hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml b/hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml index 3d8275943f8..b96883b9ac8 100755 --- a/hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml +++ b/hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml @@ -100,10 +100,14 @@ hadoop-common provided - - jdk.tools - jdk.tools - + + jdk.tools + jdk.tools + + + org.javassist + javassist + diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 84da42a3204..467c2717562 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -141,6 +141,16 @@ com.sun.jersey jersey-servlet compile + + + javax.enterprise + cdi-api + + + javax.servlet + servlet-api + + @@ -205,6 +215,12 @@ org.apache.commons commons-configuration2 compile + + + javax.servlet + servlet-api + + org.apache.commons diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml index d65e6030369..c4e65ef811d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml @@ -51,6 +51,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> log4j log4j + + org.slf4j + slf4j-ext + diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml index e17602d1f64..d4d5c1eb339 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml @@ -63,6 +63,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.hadoop hadoop-hdfs provided + + + org.ow2.asm + asm-commons + + org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml index c55cf8c3108..e3b3511c0ce 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml @@ -87,6 +87,12 @@ hadoop-hdfs test-jar test + + + org.ow2.asm + asm-commons + + org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml index 946dbe5e8bc..957202a7dd0 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml @@ -45,6 +45,12 @@ org.apache.hadoop hadoop-hdfs-client + + + org.json + json + + org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml index baf38d3c845..79327a780fc 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml @@ -39,6 +39,12 @@ org.apache.hadoop hadoop-hdfs + + + org.ow2.asm + asm-commons + + org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml index e98b574d1fe..75f250e1d72 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml @@ -93,6 +93,12 @@ hadoop-hdfs test test-jar + + + org.ow2.asm + asm-commons + + org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml index bf18d3edbc7..d6b453fb3b0 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml @@ -68,6 +68,10 @@ paranamer-ant com.thoughtworks.paranamer + + org.xerial.snappy + snappy-java + @@ -107,6 +111,12 @@ org.apache.hadoop hadoop-hdfs test + + + org.ow2.asm + asm-commons + + org.apache.hadoop diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml index 48cf27efe43..11932e04e37 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml @@ -74,6 +74,12 @@ hadoop-hdfs test test-jar + + + org.ow2.asm + asm-commons + + org.apache.hadoop diff --git a/hadoop-mapreduce-project/pom.xml b/hadoop-mapreduce-project/pom.xml index 09b4d426061..3ce66a10a84 100644 --- a/hadoop-mapreduce-project/pom.xml +++ b/hadoop-mapreduce-project/pom.xml @@ -74,6 +74,10 @@ paranamer-ant com.thoughtworks.paranamer + + org.xerial.snappy + snappy-java + diff --git a/hadoop-maven-plugins/pom.xml b/hadoop-maven-plugins/pom.xml index a5473258c35..37daeb82cd5 100644 --- a/hadoop-maven-plugins/pom.xml +++ b/hadoop-maven-plugins/pom.xml @@ -39,6 +39,12 @@ org.apache.maven maven-core ${maven.dependency.version} + + + org.sonatype.sisu + sisu-inject-plexus + + org.apache.maven.plugin-tools @@ -98,6 +104,18 @@ org.sonatype.sisu sisu-inject-plexus + + org.apache.maven.plugin-tools + maven-plugin-annotations + + + org.sonatype.aether + aether-api + + + org.sonatype.aether + aether-util + diff --git a/hadoop-minicluster/pom.xml b/hadoop-minicluster/pom.xml index cf1c9417004..c0334b3fcc1 100644 --- a/hadoop-minicluster/pom.xml +++ b/hadoop-minicluster/pom.xml @@ -41,6 +41,12 @@ hadoop-hdfs compile test-jar + + + org.ow2.asm + asm-commons + + diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 82dc6810d7c..193f898fc7f 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -858,6 +858,12 @@ com.sun.jersey jersey-core ${jersey.version} + + + org.osgi + org.osgi.core + + com.sun.jersey @@ -1783,6 +1789,12 @@ org.xerial.snappy snappy-java ${snappy-java.version} + + + org.osgi + org.osgi.core + + org.lz4 diff --git a/hadoop-tools/hadoop-aliyun/pom.xml b/hadoop-tools/hadoop-aliyun/pom.xml index c5da3e51394..570032f370b 100644 --- a/hadoop-tools/hadoop-aliyun/pom.xml +++ b/hadoop-tools/hadoop-aliyun/pom.xml @@ -117,6 +117,12 @@ org.apache.hadoop hadoop-common provided + + + org.projectlombok + lombok + + diff --git a/hadoop-tools/hadoop-archive-logs/pom.xml b/hadoop-tools/hadoop-archive-logs/pom.xml index 3caa26c52f8..f6154484ad2 100644 --- a/hadoop-tools/hadoop-archive-logs/pom.xml +++ b/hadoop-tools/hadoop-archive-logs/pom.xml @@ -59,6 +59,12 @@ hadoop-hdfs test test-jar + + + org.ow2.asm + asm-commons + + org.apache.hadoop diff --git a/hadoop-tools/hadoop-archives/pom.xml b/hadoop-tools/hadoop-archives/pom.xml index 966fff7ae7c..b16b88d11da 100644 --- a/hadoop-tools/hadoop-archives/pom.xml +++ b/hadoop-tools/hadoop-archives/pom.xml @@ -79,6 +79,12 @@ org.apache.hadoop hadoop-hdfs test + + + org.ow2.asm + asm-commons + + org.apache.hadoop diff --git a/hadoop-tools/hadoop-aws/pom.xml b/hadoop-tools/hadoop-aws/pom.xml index 4aa38f68bb5..5583bb7ad05 100644 --- a/hadoop-tools/hadoop-aws/pom.xml +++ b/hadoop-tools/hadoop-aws/pom.xml @@ -413,6 +413,16 @@ org.apache.hadoop hadoop-common provided + + + javax.servlet + servlet-api + + + javax.enterprise + cdi-api + + org.apache.hadoop @@ -472,6 +482,12 @@ hadoop-hdfs test test-jar + + + org.ow2.asm + asm-commons + + org.apache.hadoop diff --git a/hadoop-tools/hadoop-datajoin/pom.xml b/hadoop-tools/hadoop-datajoin/pom.xml index ec77281b663..890e60a3185 100644 --- a/hadoop-tools/hadoop-datajoin/pom.xml +++ b/hadoop-tools/hadoop-datajoin/pom.xml @@ -90,6 +90,12 @@ org.apache.hadoop hadoop-hdfs test + + + org.ow2.asm + asm-commons + + org.apache.hadoop diff --git a/hadoop-tools/hadoop-distcp/pom.xml b/hadoop-tools/hadoop-distcp/pom.xml index 55738ef808c..5194e51d81f 100644 --- a/hadoop-tools/hadoop-distcp/pom.xml +++ b/hadoop-tools/hadoop-distcp/pom.xml @@ -85,6 +85,12 @@ org.apache.hadoop hadoop-hdfs test + + + org.ow2.asm + asm-commons + + org.apache.hadoop diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml index 7bd4318cf70..b31f2616326 100644 --- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml +++ b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml @@ -60,6 +60,12 @@ hadoop-hdfs test-jar compile + + + org.ow2.asm + asm-commons + + org.apache.hadoop diff --git a/hadoop-tools/hadoop-extras/pom.xml b/hadoop-tools/hadoop-extras/pom.xml index 160f8b4023e..d6e0ba07dc4 100644 --- a/hadoop-tools/hadoop-extras/pom.xml +++ b/hadoop-tools/hadoop-extras/pom.xml @@ -74,6 +74,16 @@ org.apache.hadoop hadoop-common provided + + + javax.servlet + servlet-api + + + javax.enterprise + cdi-api + + org.apache.hadoop @@ -90,6 +100,12 @@ org.apache.hadoop hadoop-hdfs test + + + org.ow2.asm + asm-commons + + org.apache.hadoop diff --git a/hadoop-tools/hadoop-federation-balance/pom.xml b/hadoop-tools/hadoop-federation-balance/pom.xml index 71f2cb36391..63269b3878c 100644 --- a/hadoop-tools/hadoop-federation-balance/pom.xml +++ b/hadoop-tools/hadoop-federation-balance/pom.xml @@ -85,6 +85,12 @@ org.apache.hadoop hadoop-hdfs provided + + + org.ow2.asm + asm-commons + + org.apache.hadoop diff --git a/hadoop-tools/hadoop-fs2img/pom.xml b/hadoop-tools/hadoop-fs2img/pom.xml index 9a273621cfa..8c5ed0224bf 100644 --- a/hadoop-tools/hadoop-fs2img/pom.xml +++ b/hadoop-tools/hadoop-fs2img/pom.xml @@ -41,6 +41,12 @@ org.apache.hadoop hadoop-hdfs provided + + + org.ow2.asm + asm-commons + + org.apache.hadoop diff --git a/hadoop-tools/hadoop-gridmix/pom.xml b/hadoop-tools/hadoop-gridmix/pom.xml index f383ecad641..21d786c342d 100644 --- a/hadoop-tools/hadoop-gridmix/pom.xml +++ b/hadoop-tools/hadoop-gridmix/pom.xml @@ -90,6 +90,12 @@ org.apache.hadoop hadoop-hdfs test + + + org.ow2.asm + asm-commons + + org.apache.hadoop diff --git a/hadoop-tools/hadoop-openstack/pom.xml b/hadoop-tools/hadoop-openstack/pom.xml index e1065883feb..1577de28505 100644 --- a/hadoop-tools/hadoop-openstack/pom.xml +++ b/hadoop-tools/hadoop-openstack/pom.xml @@ -100,6 +100,12 @@ org.apache.hadoop hadoop-common compile + + + javax.enterprise + cdi-api + + org.apache.hadoop diff --git a/hadoop-tools/hadoop-rumen/pom.xml b/hadoop-tools/hadoop-rumen/pom.xml index fd3b5c9a1b8..9a966d55c0e 100644 --- a/hadoop-tools/hadoop-rumen/pom.xml +++ b/hadoop-tools/hadoop-rumen/pom.xml @@ -86,6 +86,12 @@ hadoop-hdfs test test-jar + + + org.ow2.asm + asm-commons + + org.apache.hadoop diff --git a/hadoop-tools/hadoop-streaming/pom.xml b/hadoop-tools/hadoop-streaming/pom.xml index f03eb001450..33e6ca8ff74 100644 --- a/hadoop-tools/hadoop-streaming/pom.xml +++ b/hadoop-tools/hadoop-streaming/pom.xml @@ -96,6 +96,12 @@ org.apache.hadoop hadoop-hdfs test + + + org.ow2.asm + asm-commons + + org.apache.hadoop diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml index cc811fca694..73b6ae075d6 100644 --- a/hadoop-tools/hadoop-tools-dist/pom.xml +++ b/hadoop-tools/hadoop-tools-dist/pom.xml @@ -38,6 +38,12 @@ org.apache.hadoop hadoop-streaming compile + + + org.projectlombok + lombok + + org.apache.hadoop diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml index 7e473895ca3..7e468bc7568 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml @@ -142,6 +142,12 @@ org.apache.hadoop hadoop-hdfs test + + + org.ow2.asm + asm-commons + + org.apache.hadoop @@ -153,6 +159,12 @@ hadoop-hdfs test test-jar + + + org.ow2.asm + asm-commons + + javax.ws.rs diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml index 5c7a9b7de86..4daac9fa235 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml @@ -185,6 +185,12 @@ org.apache.hadoop hadoop-hdfs + + + org.ow2.asm + asm-commons + + @@ -195,6 +201,12 @@ org.apache.commons commons-configuration2 + + + javax.servlet + servlet-api + + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml index b7ec64934c4..dbe4e9048b2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml @@ -42,6 +42,12 @@ org.apache.hadoop hadoop-hdfs test + + + org.ow2.asm + asm-commons + + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml index 9b61479528b..3bf70bf7560 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml @@ -125,6 +125,12 @@ org.apache.geronimo.specs geronimo-jcache_1.0_spec + + + org.osgi + org.osgi.core + + org.ehcache diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml index ccd1b13d157..17596405caf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml @@ -44,6 +44,12 @@ hadoop-common test-jar test + + + org.javassist + javassist + + junit @@ -55,6 +61,12 @@ mockito-core 2.8.9 test + + + org.projectlombok + lombok + + org.powermock diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml index 11be84e3c11..39706647b7a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml @@ -46,6 +46,12 @@ org.apache.hadoop hadoop-yarn-api provided + + + com.google.guava + guava + + diff --git a/pom.xml b/pom.xml index 6e295b83833..d3e95d990d0 100644 --- a/pom.xml +++ b/pom.xml @@ -100,8 +100,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x 1.7 2.4 3.0.2 - 3.0.0-M1 - 1.1.0 + 3.0.0 + 2.0.0 3.0.1 1.5 1.5 @@ -178,107 +178,104 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x - + true Use hadoop-thirdparty shaded instead of curator shaded org.apache.curator.shaded.** - static org.apache.curator.shaded.** - + true Use hadoop-common provided Sets rather than Guava provided Sets org.apache.hadoop.thirdparty.com.google.common.collect.Sets - static org.apache.hadoop.thirdparty.com.google.common.collect.Sets.** + org.apache.hadoop.thirdparty.com.google.common.collect.Sets.** - + true Use hadoop-common provided Lists rather than Guava provided Lists org.apache.hadoop.thirdparty.com.google.common.collect.Lists - static org.apache.hadoop.thirdparty.com.google.common.collect.Lists.** + org.apache.hadoop.thirdparty.com.google.common.collect.Lists.** - + true Use hadoop-annotation provided VisibleForTesting rather than the one provided by Guava org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - + true Use alternatives to Guava common classes com.google.common.** - static com.google.common.** - + true Use alternative to Guava provided BaseEncoding org.apache.hadoop.thirdparty.com.google.common.io.BaseEncoding - static org.apache.hadoop.thirdparty.com.google.common.io.BaseEncoding.** + org.apache.hadoop.thirdparty.com.google.common.io.BaseEncoding.** - + true Use alternative to Guava provided Optional org.apache.hadoop.thirdparty.com.google.common.base.Optional - static org.apache.hadoop.thirdparty.com.google.common.base.Optional.** + org.apache.hadoop.thirdparty.com.google.common.base.Optional.** - + true Use alternative to Guava provided Function org.apache.hadoop.thirdparty.com.google.common.base.Function - static org.apache.hadoop.thirdparty.com.google.common.base.Function.** + org.apache.hadoop.thirdparty.com.google.common.base.Function.** - + true Use alternative to Guava provided Predicate org.apache.hadoop.thirdparty.com.google.common.base.Predicate - static org.apache.hadoop.thirdparty.com.google.common.base.Predicate.** + org.apache.hadoop.thirdparty.com.google.common.base.Predicate.** - + true Use alternative to Guava provided Supplier org.apache.hadoop.thirdparty.com.google.common.base.Supplier - static org.apache.hadoop.thirdparty.com.google.common.base.Supplier.** + org.apache.hadoop.thirdparty.com.google.common.base.Supplier.** - + true Use alternative to Guava provided ImmutableListMultimap org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableListMultimap - static org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableListMultimap.** + org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableListMultimap.** - + true Use hadoop-common provided Preconditions rather than Guava provided org.apache.hadoop.thirdparty.com.google.common.base.Preconditions - static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.** + org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.** - + true Use Fasterxml Jackson 2 dependency in place of org.codehaus Jackson 1 org.codehaus.jackson.** - static org.codehaus.jackson.**