From ce4be63aafe16360ee6dffc5c236aed9ee74eafa Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Sat, 19 Feb 2022 00:30:49 +0530 Subject: [PATCH 1/9] HADOOP-18131. Upgrade maven enforcer plugin and relevant dependencies --- .../hadoop-client-api/pom.xml | 6 +++ .../hadoop-client-check-invariants/pom.xml | 2 +- .../pom.xml | 2 +- .../hadoop-client-minicluster/pom.xml | 32 ++++++++++-- .../hadoop-client-runtime/pom.xml | 6 +++ .../hadoop-cloud-storage/pom.xml | 4 ++ .../hadoop-huaweicloud/pom.xml | 12 +++-- hadoop-common-project/hadoop-auth/pom.xml | 6 +++ hadoop-common-project/hadoop-common/pom.xml | 28 ++++++++++ hadoop-common-project/hadoop-kms/pom.xml | 12 +++++ hadoop-common-project/hadoop-registry/pom.xml | 6 +++ .../hadoop-hdfs-client/pom.xml | 4 ++ .../hadoop-hdfs-httpfs/pom.xml | 6 +++ hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml | 12 +++++ hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml | 12 +++++ hadoop-hdfs-project/hadoop-hdfs/pom.xml | 12 +++++ .../hdfs/qjournal/server/JournalNode.java | 1 + .../hadoop-mapreduce-client-app/pom.xml | 6 +++ .../hadoop-mapreduce-client-core/pom.xml | 6 +++ .../hadoop-mapreduce-client-hs/pom.xml | 10 ++++ .../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-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 | 26 ++++++++++ hadoop-tools/hadoop-datajoin/pom.xml | 6 +++ hadoop-tools/hadoop-distcp/pom.xml | 6 +++ .../hadoop-dynamometer-infra/pom.xml | 10 ++++ hadoop-tools/hadoop-extras/pom.xml | 26 ++++++++++ .../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 | 10 ++++ hadoop-tools/hadoop-rumen/pom.xml | 6 +++ hadoop-tools/hadoop-streaming/pom.xml | 6 +++ hadoop-tools/hadoop-tools-dist/pom.xml | 6 +++ .../pom.xml | 18 +++++++ .../pom.xml | 6 +++ .../pom.xml | 6 +++ .../hadoop-yarn-services-api/pom.xml | 18 +++++++ .../hadoop-yarn-services-core/pom.xml | 30 +++++++++++ .../hadoop-yarn/hadoop-yarn-client/pom.xml | 12 +++++ .../hadoop-yarn/hadoop-yarn-common/pom.xml | 6 +++ .../pom.xml | 6 +++ .../hadoop-yarn-server-common/pom.xml | 12 +++++ .../hadoop-yarn-server-nodemanager/pom.xml | 6 +++ .../pom.xml | 12 +++++ .../hadoop-yarn-server-router/pom.xml | 6 +++ .../pom.xml | 6 +++ .../pom.xml | 6 +++ .../pom.xml | 18 +++++++ .../pom.xml | 6 +++ .../pom.xml | 14 +++++ hadoop-yarn-project/pom.xml | 18 +++++++ pom.xml | 51 +++++++++---------- 60 files changed, 593 insertions(+), 37 deletions(-) diff --git a/hadoop-client-modules/hadoop-client-api/pom.xml b/hadoop-client-modules/hadoop-client-api/pom.xml index 9b70f8c8b01e0..7199f55c2648f 100644 --- a/hadoop-client-modules/hadoop-client-api/pom.xml +++ b/hadoop-client-modules/hadoop-client-api/pom.xml @@ -73,6 +73,12 @@ org.xerial.snappy snappy-java + + + org.osgi + org.osgi.core + + diff --git a/hadoop-client-modules/hadoop-client-check-invariants/pom.xml b/hadoop-client-modules/hadoop-client-check-invariants/pom.xml index 9d4bce1fddccd..b1c00678406d7 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 635250ec1ae1f..0e576ac6f0666 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-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml index 2a0a5c19230a6..4e963887a52e4 100644 --- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml +++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml @@ -45,6 +45,12 @@ org.xerial.snappy snappy-java runtime + + + org.osgi + org.osgi.core + + org.apache.hadoop @@ -332,6 +338,10 @@ org.apache.hadoop.thirdparty hadoop-shaded-guava + + org.ow2.asm + asm-commons + - com.sun.jersey - jersey-core + com.sun.jersey + jersey-core true javax.ws.rs jsr311-api + + org.osgi + org.osgi.core + @@ -451,9 +465,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-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml index 35fbd7665fb26..84dc49afd7bd1 100644 --- a/hadoop-client-modules/hadoop-client-runtime/pom.xml +++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml @@ -65,6 +65,12 @@ org.xerial.snappy snappy-java runtime + + + org.osgi + org.osgi.core + + diff --git a/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml b/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml index a8f45a7f3a222..33d3f9578172f 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 3d8275943f8f3..b96883b9ac80d 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-auth/pom.xml b/hadoop-common-project/hadoop-auth/pom.xml index 6eaa4fdfce5b4..14944b73f76f2 100644 --- a/hadoop-common-project/hadoop-auth/pom.xml +++ b/hadoop-common-project/hadoop-auth/pom.xml @@ -136,6 +136,12 @@ org.xerial.snappy snappy-java provided + + + org.osgi + org.osgi.core + + org.apache.curator diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 84da42a3204fc..5a23ebb790763 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -136,11 +136,27 @@ com.sun.jersey jersey-core compile + + + org.osgi + org.osgi.core + + com.sun.jersey jersey-servlet compile + + + javax.enterprise + cdi-api + + + javax.servlet + servlet-api + + @@ -205,6 +221,12 @@ org.apache.commons commons-configuration2 compile + + + javax.servlet + servlet-api + + org.apache.commons @@ -387,6 +409,12 @@ org.xerial.snappy snappy-java compile + + + org.osgi + org.osgi.core + + org.lz4 diff --git a/hadoop-common-project/hadoop-kms/pom.xml b/hadoop-common-project/hadoop-kms/pom.xml index 96588a22b9419..855fee2de72a5 100644 --- a/hadoop-common-project/hadoop-kms/pom.xml +++ b/hadoop-common-project/hadoop-kms/pom.xml @@ -52,6 +52,12 @@ org.apache.hadoop hadoop-auth compile + + + org.osgi + org.osgi.core + + org.apache.hadoop.thirdparty @@ -62,6 +68,12 @@ com.sun.jersey jersey-core compile + + + org.osgi + org.osgi.core + + com.sun.jersey diff --git a/hadoop-common-project/hadoop-registry/pom.xml b/hadoop-common-project/hadoop-registry/pom.xml index 725dda50f216b..206a957f26c44 100644 --- a/hadoop-common-project/hadoop-registry/pom.xml +++ b/hadoop-common-project/hadoop-registry/pom.xml @@ -144,6 +144,12 @@ org.xerial.snappy snappy-java provided + + + org.osgi + org.osgi.core + + diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml index d65e6030369b3..c4e65ef811dbf 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-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml index a1b3ab1f92397..d55da7bfed0ff 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml @@ -61,6 +61,12 @@ com.sun.jersey jersey-core compile + + + org.osgi + org.osgi.core + + com.sun.jersey diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml index 24599a2b244a4..a86bba66c6a3f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml @@ -92,6 +92,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.xerial.snappy snappy-java provided + + + org.osgi + org.osgi.core + + org.apache.hadoop.thirdparty @@ -112,6 +118,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> com.sun.jersey jersey-core compile + + + org.osgi + org.osgi.core + + com.sun.jersey diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml index e17602d1f6466..685b139d4b0cc 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 @@ -130,6 +136,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.hadoop hadoop-mapreduce-client-app test + + + org.osgi + org.osgi.core + + org.apache.hadoop diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index b51c7154f7b92..bab20ae35151f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -44,6 +44,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.hadoop hadoop-common provided + + + org.osgi + org.osgi.core + + org.apache.hadoop @@ -71,6 +77,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.xerial.snappy snappy-java provided + + + org.osgi + org.osgi.core + + org.apache.hadoop.thirdparty diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java index d61987ac9b433..6415a6ccc9798 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java @@ -62,6 +62,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; /** 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 c55cf8c3108a9..e3b3511c0ce17 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 946dbe5e8bc72..957202a7dd0ba 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 baf38d3c84511..a994d2ee3878f 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,16 @@ org.apache.hadoop hadoop-hdfs + + + org.osgi + org.osgi.core + + + 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 e98b574d1fe38..75f250e1d7271 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 bf18d3edbc774..d6b453fb3b034 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 48cf27efe437f..11932e04e3784 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 09b4d42606118..3ce66a10a84f7 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 a5473258c35f6..37daeb82cd506 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 cf1c9417004c4..c0334b3fcc178 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-tools/hadoop-aliyun/pom.xml b/hadoop-tools/hadoop-aliyun/pom.xml index c5da3e513949f..570032f370b57 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 3caa26c52f884..f6154484ad270 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 966fff7ae7c5b..b16b88d11dada 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 4aa38f68bb54f..45fbd44e9ac28 100644 --- a/hadoop-tools/hadoop-aws/pom.xml +++ b/hadoop-tools/hadoop-aws/pom.xml @@ -413,6 +413,20 @@ org.apache.hadoop hadoop-common provided + + + org.osgi + org.osgi.core + + + javax.servlet + servlet-api + + + javax.enterprise + cdi-api + + org.apache.hadoop @@ -455,6 +469,12 @@ hadoop-yarn-server-tests test test-jar + + + org.osgi + org.osgi.core + + org.apache.hadoop @@ -472,6 +492,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 ec77281b66350..890e60a318513 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 55738ef808c28..5194e51d81fbf 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 7bd4318cf70ce..a5acc1b96bbff 100644 --- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml +++ b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml @@ -60,6 +60,16 @@ hadoop-hdfs test-jar compile + + + org.osgi + org.osgi.core + + + 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 160f8b4023efb..5725506cd2723 100644 --- a/hadoop-tools/hadoop-extras/pom.xml +++ b/hadoop-tools/hadoop-extras/pom.xml @@ -74,6 +74,20 @@ org.apache.hadoop hadoop-common provided + + + javax.servlet + servlet-api + + + javax.enterprise + cdi-api + + + org.osgi + org.osgi.core + + org.apache.hadoop @@ -90,6 +104,12 @@ org.apache.hadoop hadoop-hdfs test + + + org.ow2.asm + asm-commons + + org.apache.hadoop @@ -102,6 +122,12 @@ hadoop-yarn-server-tests test-jar test + + + org.osgi + org.osgi.core + + cglib diff --git a/hadoop-tools/hadoop-federation-balance/pom.xml b/hadoop-tools/hadoop-federation-balance/pom.xml index 71f2cb3639137..63269b3878cbd 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 9a273621cfa9d..8c5ed0224bf14 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 f383ecad64150..21d786c342d6c 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 e1065883feb9e..89ab0c72b276b 100644 --- a/hadoop-tools/hadoop-openstack/pom.xml +++ b/hadoop-tools/hadoop-openstack/pom.xml @@ -100,6 +100,16 @@ org.apache.hadoop hadoop-common compile + + + org.osgi + org.osgi.core + + + javax.enterprise + cdi-api + + org.apache.hadoop diff --git a/hadoop-tools/hadoop-rumen/pom.xml b/hadoop-tools/hadoop-rumen/pom.xml index fd3b5c9a1b8fa..9a966d55c0ed1 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 f03eb001450b4..33e6ca8ff7491 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 cc811fca6949d..73b6ae075d611 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 7e473895ca3a6..0581f94f69d33 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 @@ -64,6 +64,12 @@ org.apache.hadoop hadoop-yarn-server-applicationhistoryservice + + + org.osgi + org.osgi.core + + org.apache.hadoop @@ -142,6 +148,12 @@ org.apache.hadoop hadoop-hdfs test + + + org.ow2.asm + asm-commons + + org.apache.hadoop @@ -153,6 +165,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-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml index 2809c75ffd84f..3b7692e7a198e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml @@ -113,6 +113,12 @@ org.xerial.snappy snappy-java provided + + + org.osgi + org.osgi.core + + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml index 405e44188dc77..75fe518f90b66 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml @@ -71,6 +71,12 @@ hadoop-yarn-server-tests test-jar test + + + org.osgi + org.osgi.core + + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/pom.xml index 2da2cdd42a82a..2671ec4df2039 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/pom.xml @@ -94,10 +94,22 @@ org.apache.hadoop hadoop-yarn-client + + + org.osgi + org.osgi.core + + org.apache.hadoop hadoop-yarn-common + + + org.osgi + org.osgi.core + + org.apache.hadoop @@ -106,6 +118,12 @@ org.apache.hadoop hadoop-yarn-server-common + + + org.osgi + org.osgi.core + + org.apache.hadoop 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 5c7a9b7de862c..d70fd5f7e4cd7 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 @@ -150,6 +150,12 @@ org.apache.hadoop hadoop-yarn-client + + + org.osgi + org.osgi.core + + @@ -160,11 +166,23 @@ org.apache.hadoop hadoop-yarn-common + + + org.osgi + org.osgi.core + + org.apache.hadoop hadoop-yarn-server-common + + + org.osgi + org.osgi.core + + @@ -185,6 +203,12 @@ org.apache.hadoop hadoop-hdfs + + + org.ow2.asm + asm-commons + + @@ -195,6 +219,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 b7ec64934c420..8d82b45a61fc5 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 + + @@ -111,6 +117,12 @@ org.xerial.snappy snappy-java provided + + + org.osgi + org.osgi.core + + junit diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml index efebb0853d707..34029479c493e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -79,6 +79,12 @@ com.sun.jersey jersey-core + + + org.osgi + org.osgi.core + + com.sun.jersey diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml index 9c87f44a6d73d..c8b06f464779b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml @@ -145,6 +145,12 @@ com.sun.jersey jersey-core + + + org.osgi + org.osgi.core + + com.sun.jersey 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 9b61479528bf1..314deb844e041 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 @@ -117,6 +117,12 @@ org.xerial.snappy snappy-java provided + + + org.osgi + org.osgi.core + + ${leveldbjni.group} @@ -125,6 +131,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-nodemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml index b51d51cffde95..e4c39d1e0bc38 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml @@ -75,6 +75,12 @@ com.sun.jersey jersey-core + + + org.osgi + org.osgi.core + + com.sun.jersey diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml index 1a0f4c00f77b3..747c57f7be942 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml @@ -160,6 +160,12 @@ com.sun.jersey jersey-core + + + org.osgi + org.osgi.core + + com.sun.jersey @@ -229,6 +235,12 @@ org.xerial.snappy snappy-java provided + + + org.osgi + org.osgi.core + + ${leveldbjni.group} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/pom.xml index 8ef7b62f24f4f..00da87e13b78f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/pom.xml @@ -58,6 +58,12 @@ org.apache.hadoop hadoop-yarn-server-common + + + org.osgi + org.osgi.core + + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/pom.xml index fd429a5f93e67..c9005706590fa 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/pom.xml @@ -44,6 +44,12 @@ org.apache.hadoop hadoop-yarn-server-common + + + org.osgi + org.osgi.core + + org.apache.hadoop diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml index 0954c566427c4..e07686a39e83b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml @@ -87,6 +87,12 @@ org.apache.hadoop hadoop-yarn-server-applicationhistoryservice ${project.version} + + + org.osgi + org.osgi.core + + org.apache.hadoop 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 ccd1b13d1572a..dcd7812e4080f 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 @@ -38,12 +38,24 @@ hadoop-yarn-server-timelineservice ${project.version} provided + + + org.osgi + org.osgi.core + + org.apache.hadoop hadoop-common test-jar test + + + org.javassist + javassist + + junit @@ -55,6 +67,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-client/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml index 0bedcfcb27fa4..f1e12c16f2725 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml @@ -149,6 +149,12 @@ org.apache.hadoop hadoop-yarn-server-common provided + + + org.osgi + org.osgi.core + + 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 11be84e3c11fa..8c6ad3f6cfadf 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 + + @@ -60,6 +66,10 @@ com.google.inject guice + + org.osgi + org.osgi.core + @@ -73,6 +83,10 @@ com.google.inject guice + + org.osgi + org.osgi.core + diff --git a/hadoop-yarn-project/pom.xml b/hadoop-yarn-project/pom.xml index abaf2e869c48f..ca82981d33048 100644 --- a/hadoop-yarn-project/pom.xml +++ b/hadoop-yarn-project/pom.xml @@ -52,14 +52,32 @@ org.apache.hadoop hadoop-yarn-client + + + org.osgi + org.osgi.core + + org.apache.hadoop hadoop-yarn-common + + + org.osgi + org.osgi.core + + org.apache.hadoop hadoop-yarn-server-common + + + org.osgi + org.osgi.core + + org.apache.hadoop diff --git a/pom.xml b/pom.xml index 6e295b838333d..d3e95d990d020 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.** From 387e01f15f62556ffe5ded6eea92838862cc01c7 Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Sun, 20 Feb 2022 00:23:24 +0530 Subject: [PATCH 2/9] increase build timeout --- dev-support/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile index 0ec32e385d275..32c4098ec2b57 100644 --- a/dev-support/Jenkinsfile +++ b/dev-support/Jenkinsfile @@ -47,7 +47,7 @@ pipeline { options { buildDiscarder(logRotator(numToKeepStr: '5')) - timeout (time: 24, unit: 'HOURS') + timeout (time: 30, unit: 'HOURS') timestamps() checkoutToSubdirectory('src') } From 0b420eeb02cd6732ce887fa29b6510d0d4f849fc Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Mon, 21 Feb 2022 00:48:29 +0530 Subject: [PATCH 3/9] minor change --- .../java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java | 1 - 1 file changed, 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java index 6415a6ccc9798..d61987ac9b433 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java @@ -62,7 +62,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; /** From fbc9378b0c61ddb8b1ce66942e95f4400cec1475 Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Mon, 21 Feb 2022 11:35:23 +0530 Subject: [PATCH 4/9] Dependency convergence error --- .../hadoop-client-integration-tests/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hadoop-client-modules/hadoop-client-integration-tests/pom.xml b/hadoop-client-modules/hadoop-client-integration-tests/pom.xml index 967782163f7e8..ba593ebd1b42d 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 From 05e5c2d832697369ce80e0bc45c69ba63d331f7e Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Thu, 24 Feb 2022 12:39:50 +0530 Subject: [PATCH 5/9] Revert "increase build timeout" This reverts commit 387e01f15f62556ffe5ded6eea92838862cc01c7. --- dev-support/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile index 32c4098ec2b57..0ec32e385d275 100644 --- a/dev-support/Jenkinsfile +++ b/dev-support/Jenkinsfile @@ -47,7 +47,7 @@ pipeline { options { buildDiscarder(logRotator(numToKeepStr: '5')) - timeout (time: 30, unit: 'HOURS') + timeout (time: 24, unit: 'HOURS') timestamps() checkoutToSubdirectory('src') } From 282050abfdf84b70a3ee5f30f3e855e53a9f3896 Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Fri, 25 Feb 2022 22:41:36 +0530 Subject: [PATCH 6/9] addressing review - keep exclude in hadoop-project --- hadoop-client-modules/hadoop-client-api/pom.xml | 6 ------ .../hadoop-client-minicluster/pom.xml | 10 ---------- hadoop-client-modules/hadoop-client-runtime/pom.xml | 6 ------ hadoop-common-project/hadoop-auth/pom.xml | 6 ------ hadoop-common-project/hadoop-common/pom.xml | 12 ------------ hadoop-common-project/hadoop-kms/pom.xml | 6 ------ hadoop-common-project/hadoop-registry/pom.xml | 6 ------ hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 6 ------ hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml | 12 ------------ hadoop-hdfs-project/hadoop-hdfs/pom.xml | 6 ------ hadoop-project/pom.xml | 12 ++++++++++++ .../hadoop-yarn-applications-mawo-core/pom.xml | 6 ------ .../hadoop-yarn/hadoop-yarn-client/pom.xml | 6 ------ .../hadoop-yarn/hadoop-yarn-common/pom.xml | 6 ------ .../pom.xml | 6 ------ .../hadoop-yarn-server-common/pom.xml | 6 ------ .../hadoop-yarn-server-nodemanager/pom.xml | 6 ------ .../hadoop-yarn-server-resourcemanager/pom.xml | 12 ------------ 18 files changed, 12 insertions(+), 124 deletions(-) diff --git a/hadoop-client-modules/hadoop-client-api/pom.xml b/hadoop-client-modules/hadoop-client-api/pom.xml index 7199f55c2648f..9b70f8c8b01e0 100644 --- a/hadoop-client-modules/hadoop-client-api/pom.xml +++ b/hadoop-client-modules/hadoop-client-api/pom.xml @@ -73,12 +73,6 @@ org.xerial.snappy snappy-java - - - org.osgi - org.osgi.core - - diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml index 4e963887a52e4..d70198ac428fa 100644 --- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml +++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml @@ -45,12 +45,6 @@ org.xerial.snappy snappy-java runtime - - - org.osgi - org.osgi.core - - org.apache.hadoop @@ -421,10 +415,6 @@ javax.ws.rs jsr311-api - - org.osgi - org.osgi.core - diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml index 84dc49afd7bd1..35fbd7665fb26 100644 --- a/hadoop-client-modules/hadoop-client-runtime/pom.xml +++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml @@ -65,12 +65,6 @@ org.xerial.snappy snappy-java runtime - - - org.osgi - org.osgi.core - - diff --git a/hadoop-common-project/hadoop-auth/pom.xml b/hadoop-common-project/hadoop-auth/pom.xml index 14944b73f76f2..6eaa4fdfce5b4 100644 --- a/hadoop-common-project/hadoop-auth/pom.xml +++ b/hadoop-common-project/hadoop-auth/pom.xml @@ -136,12 +136,6 @@ org.xerial.snappy snappy-java provided - - - org.osgi - org.osgi.core - - org.apache.curator diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 5a23ebb790763..467c2717562ca 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -136,12 +136,6 @@ com.sun.jersey jersey-core compile - - - org.osgi - org.osgi.core - - com.sun.jersey @@ -409,12 +403,6 @@ org.xerial.snappy snappy-java compile - - - org.osgi - org.osgi.core - - org.lz4 diff --git a/hadoop-common-project/hadoop-kms/pom.xml b/hadoop-common-project/hadoop-kms/pom.xml index 855fee2de72a5..6cfa270ed70be 100644 --- a/hadoop-common-project/hadoop-kms/pom.xml +++ b/hadoop-common-project/hadoop-kms/pom.xml @@ -68,12 +68,6 @@ com.sun.jersey jersey-core compile - - - org.osgi - org.osgi.core - - com.sun.jersey diff --git a/hadoop-common-project/hadoop-registry/pom.xml b/hadoop-common-project/hadoop-registry/pom.xml index 206a957f26c44..725dda50f216b 100644 --- a/hadoop-common-project/hadoop-registry/pom.xml +++ b/hadoop-common-project/hadoop-registry/pom.xml @@ -144,12 +144,6 @@ org.xerial.snappy snappy-java provided - - - org.osgi - org.osgi.core - - diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml index d55da7bfed0ff..a1b3ab1f92397 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml @@ -61,12 +61,6 @@ com.sun.jersey jersey-core compile - - - org.osgi - org.osgi.core - - com.sun.jersey diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml index a86bba66c6a3f..24599a2b244a4 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml @@ -92,12 +92,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.xerial.snappy snappy-java provided - - - org.osgi - org.osgi.core - - org.apache.hadoop.thirdparty @@ -118,12 +112,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> com.sun.jersey jersey-core compile - - - org.osgi - org.osgi.core - - com.sun.jersey diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index bab20ae35151f..28faedb3b307a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -77,12 +77,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.xerial.snappy snappy-java provided - - - org.osgi - org.osgi.core - - org.apache.hadoop.thirdparty diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 4171ef67d475d..a9d8f91e5c8be 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -857,6 +857,12 @@ com.sun.jersey jersey-core ${jersey.version} + + + org.osgi + org.osgi.core + + com.sun.jersey @@ -1782,6 +1788,12 @@ org.xerial.snappy snappy-java ${snappy-java.version} + + + org.osgi + org.osgi.core + + org.lz4 diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml index 3b7692e7a198e..2809c75ffd84f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml @@ -113,12 +113,6 @@ org.xerial.snappy snappy-java provided - - - org.osgi - org.osgi.core - - 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 8d82b45a61fc5..dbe4e9048b2df 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml @@ -117,12 +117,6 @@ org.xerial.snappy snappy-java provided - - - org.osgi - org.osgi.core - - junit diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml index 34029479c493e..efebb0853d707 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -79,12 +79,6 @@ com.sun.jersey jersey-core - - - org.osgi - org.osgi.core - - com.sun.jersey diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml index c8b06f464779b..9c87f44a6d73d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml @@ -145,12 +145,6 @@ com.sun.jersey jersey-core - - - org.osgi - org.osgi.core - - com.sun.jersey 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 314deb844e041..3bf70bf7560e5 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 @@ -117,12 +117,6 @@ org.xerial.snappy snappy-java provided - - - org.osgi - org.osgi.core - - ${leveldbjni.group} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml index e4c39d1e0bc38..b51d51cffde95 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml @@ -75,12 +75,6 @@ com.sun.jersey jersey-core - - - org.osgi - org.osgi.core - - com.sun.jersey diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml index 747c57f7be942..1a0f4c00f77b3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml @@ -160,12 +160,6 @@ com.sun.jersey jersey-core - - - org.osgi - org.osgi.core - - com.sun.jersey @@ -235,12 +229,6 @@ org.xerial.snappy snappy-java provided - - - org.osgi - org.osgi.core - - ${leveldbjni.group} From f61a560113c63bd4ad686f6cab2c273b52910ddb Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Sat, 26 Feb 2022 12:30:44 +0530 Subject: [PATCH 7/9] exclude osgi.core --- hadoop-common-project/hadoop-kms/pom.xml | 6 ------ hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml | 6 ------ hadoop-hdfs-project/hadoop-hdfs/pom.xml | 6 ------ .../hadoop-mapreduce-client-hs/pom.xml | 4 ---- hadoop-tools/hadoop-aws/pom.xml | 10 ---------- .../hadoop-dynamometer-infra/pom.xml | 4 ---- hadoop-tools/hadoop-extras/pom.xml | 10 ---------- hadoop-tools/hadoop-openstack/pom.xml | 4 ---- .../pom.xml | 6 ------ .../pom.xml | 6 ------ .../hadoop-yarn-services-api/pom.xml | 18 ------------------ .../hadoop-yarn-services-core/pom.xml | 18 ------------------ .../hadoop-yarn-server-router/pom.xml | 6 ------ .../pom.xml | 6 ------ .../pom.xml | 6 ------ .../pom.xml | 6 ------ .../pom.xml | 6 ------ .../pom.xml | 8 -------- hadoop-yarn-project/pom.xml | 18 ------------------ 19 files changed, 154 deletions(-) diff --git a/hadoop-common-project/hadoop-kms/pom.xml b/hadoop-common-project/hadoop-kms/pom.xml index 6cfa270ed70be..96588a22b9419 100644 --- a/hadoop-common-project/hadoop-kms/pom.xml +++ b/hadoop-common-project/hadoop-kms/pom.xml @@ -52,12 +52,6 @@ org.apache.hadoop hadoop-auth compile - - - org.osgi - org.osgi.core - - org.apache.hadoop.thirdparty diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml index 685b139d4b0cc..d4d5c1eb33983 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml @@ -136,12 +136,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.hadoop hadoop-mapreduce-client-app test - - - org.osgi - org.osgi.core - - org.apache.hadoop diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index 28faedb3b307a..b51c7154f7b92 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -44,12 +44,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.hadoop hadoop-common provided - - - org.osgi - org.osgi.core - - 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 a994d2ee3878f..79327a780fceb 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 @@ -40,10 +40,6 @@ org.apache.hadoop hadoop-hdfs - - org.osgi - org.osgi.core - org.ow2.asm asm-commons diff --git a/hadoop-tools/hadoop-aws/pom.xml b/hadoop-tools/hadoop-aws/pom.xml index 45fbd44e9ac28..5583bb7ad05ec 100644 --- a/hadoop-tools/hadoop-aws/pom.xml +++ b/hadoop-tools/hadoop-aws/pom.xml @@ -414,10 +414,6 @@ hadoop-common provided - - org.osgi - org.osgi.core - javax.servlet servlet-api @@ -469,12 +465,6 @@ hadoop-yarn-server-tests test test-jar - - - org.osgi - org.osgi.core - - 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 a5acc1b96bbff..b31f26163265f 100644 --- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml +++ b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml @@ -61,10 +61,6 @@ test-jar compile - - org.osgi - org.osgi.core - org.ow2.asm asm-commons diff --git a/hadoop-tools/hadoop-extras/pom.xml b/hadoop-tools/hadoop-extras/pom.xml index 5725506cd2723..d6e0ba07dc4f8 100644 --- a/hadoop-tools/hadoop-extras/pom.xml +++ b/hadoop-tools/hadoop-extras/pom.xml @@ -83,10 +83,6 @@ javax.enterprise cdi-api - - org.osgi - org.osgi.core - @@ -122,12 +118,6 @@ hadoop-yarn-server-tests test-jar test - - - org.osgi - org.osgi.core - - cglib diff --git a/hadoop-tools/hadoop-openstack/pom.xml b/hadoop-tools/hadoop-openstack/pom.xml index 89ab0c72b276b..1577de28505ad 100644 --- a/hadoop-tools/hadoop-openstack/pom.xml +++ b/hadoop-tools/hadoop-openstack/pom.xml @@ -101,10 +101,6 @@ hadoop-common compile - - org.osgi - org.osgi.core - javax.enterprise cdi-api 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 0581f94f69d33..7e468bc75684e 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 @@ -64,12 +64,6 @@ org.apache.hadoop hadoop-yarn-server-applicationhistoryservice - - - org.osgi - org.osgi.core - - org.apache.hadoop diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml index 75fe518f90b66..405e44188dc77 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml @@ -71,12 +71,6 @@ hadoop-yarn-server-tests test-jar test - - - org.osgi - org.osgi.core - - diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/pom.xml index 2671ec4df2039..2da2cdd42a82a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/pom.xml @@ -94,22 +94,10 @@ org.apache.hadoop hadoop-yarn-client - - - org.osgi - org.osgi.core - - org.apache.hadoop hadoop-yarn-common - - - org.osgi - org.osgi.core - - org.apache.hadoop @@ -118,12 +106,6 @@ org.apache.hadoop hadoop-yarn-server-common - - - org.osgi - org.osgi.core - - org.apache.hadoop 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 d70fd5f7e4cd7..4daac9fa235ae 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 @@ -150,12 +150,6 @@ org.apache.hadoop hadoop-yarn-client - - - org.osgi - org.osgi.core - - @@ -166,23 +160,11 @@ org.apache.hadoop hadoop-yarn-common - - - org.osgi - org.osgi.core - - org.apache.hadoop hadoop-yarn-server-common - - - org.osgi - org.osgi.core - - diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/pom.xml index 00da87e13b78f..8ef7b62f24f4f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/pom.xml @@ -58,12 +58,6 @@ org.apache.hadoop hadoop-yarn-server-common - - - org.osgi - org.osgi.core - - diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/pom.xml index c9005706590fa..fd429a5f93e67 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/pom.xml @@ -44,12 +44,6 @@ org.apache.hadoop hadoop-yarn-server-common - - - org.osgi - org.osgi.core - - org.apache.hadoop diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml index e07686a39e83b..0954c566427c4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml @@ -87,12 +87,6 @@ org.apache.hadoop hadoop-yarn-server-applicationhistoryservice ${project.version} - - - org.osgi - org.osgi.core - - org.apache.hadoop 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 dcd7812e4080f..17596405caf23 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 @@ -38,12 +38,6 @@ hadoop-yarn-server-timelineservice ${project.version} provided - - - org.osgi - org.osgi.core - - org.apache.hadoop diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml index f1e12c16f2725..0bedcfcb27fa4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml @@ -149,12 +149,6 @@ org.apache.hadoop hadoop-yarn-server-common provided - - - org.osgi - org.osgi.core - - 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 8c6ad3f6cfadf..39706647b7a23 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 @@ -66,10 +66,6 @@ com.google.inject guice - - org.osgi - org.osgi.core - @@ -83,10 +79,6 @@ com.google.inject guice - - org.osgi - org.osgi.core - diff --git a/hadoop-yarn-project/pom.xml b/hadoop-yarn-project/pom.xml index ca82981d33048..abaf2e869c48f 100644 --- a/hadoop-yarn-project/pom.xml +++ b/hadoop-yarn-project/pom.xml @@ -52,32 +52,14 @@ org.apache.hadoop hadoop-yarn-client - - - org.osgi - org.osgi.core - - org.apache.hadoop hadoop-yarn-common - - - org.osgi - org.osgi.core - - org.apache.hadoop hadoop-yarn-server-common - - - org.osgi - org.osgi.core - - org.apache.hadoop From ec1c6cea71583764181a8923dbd54d79a74520a2 Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Sat, 26 Feb 2022 12:31:51 +0530 Subject: [PATCH 8/9] Revert "Revert "increase build timeout"" This reverts commit 05e5c2d832697369ce80e0bc45c69ba63d331f7e. --- dev-support/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile index 0ec32e385d275..32c4098ec2b57 100644 --- a/dev-support/Jenkinsfile +++ b/dev-support/Jenkinsfile @@ -47,7 +47,7 @@ pipeline { options { buildDiscarder(logRotator(numToKeepStr: '5')) - timeout (time: 24, unit: 'HOURS') + timeout (time: 30, unit: 'HOURS') timestamps() checkoutToSubdirectory('src') } From a48af22c5789de6105f98f71807ee5a092a04624 Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Thu, 3 Mar 2022 20:30:31 +0530 Subject: [PATCH 9/9] Revert "Revert "Revert "increase build timeout""" This reverts commit ec1c6cea71583764181a8923dbd54d79a74520a2. --- dev-support/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile index 32c4098ec2b57..0ec32e385d275 100644 --- a/dev-support/Jenkinsfile +++ b/dev-support/Jenkinsfile @@ -47,7 +47,7 @@ pipeline { options { buildDiscarder(logRotator(numToKeepStr: '5')) - timeout (time: 30, unit: 'HOURS') + timeout (time: 24, unit: 'HOURS') timestamps() checkoutToSubdirectory('src') }