From f35f7024264d375a397b5bb70c16198d3e3738ab Mon Sep 17 00:00:00 2001 From: Vinod Kumar Vavilapalli Date: Mon, 13 Jan 2014 18:34:39 +0000 Subject: [PATCH] YARN-888. Cleaned up POM files so that non-leaf modules don't include any dependencies and thus compact the dependency list for leaf modules. Contributed by Alejandro Abdelnur. svn merge --ignore-ancestry -c 1557801 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557802 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-project/pom.xml | 23 ++- hadoop-yarn-project/CHANGES.txt | 4 + .../hadoop-yarn/hadoop-yarn-api/pom.xml | 50 ++++++ .../pom.xml | 78 ++++++++- .../pom.xml | 60 ++++--- .../hadoop-yarn-applications/pom.xml | 2 + .../hadoop-yarn/hadoop-yarn-client/pom.xml | 102 +++++++++++- .../hadoop-yarn/hadoop-yarn-common/pom.xml | 140 +++++++++++++++- .../hadoop-yarn-server-common/pom.xml | 62 +++++++ .../hadoop-yarn-server-nodemanager/pom.xml | 135 +++++++++++++++ .../pom.xml | 154 ++++++++++++++++++ .../hadoop-yarn-server-tests/pom.xml | 72 ++++++++ .../hadoop-yarn-server-web-proxy/pom.xml | 80 +++++++++ .../hadoop-yarn/hadoop-yarn-server/pom.xml | 9 +- .../hadoop-yarn/hadoop-yarn-site/pom.xml | 3 + hadoop-yarn-project/hadoop-yarn/pom.xml | 107 +----------- hadoop-yarn-project/pom.xml | 127 +-------------- 17 files changed, 923 insertions(+), 285 deletions(-) diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 797c4064e0a..6fb667edcdf 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -754,7 +754,28 @@ com.google.code.findbugs jsr305 1.3.9 - + + + javax.xml.bind + jaxb-api + 2.2.2 + + + org.codehaus.jettison + jettison + 1.1 + + + com.sun.jersey + jersey-client + ${jersey.version} + + + + org.glassfish.grizzly + grizzly-http-servlet + 2.1.2 + diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 0e3de4458c7..f1700dc3a07 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -201,6 +201,10 @@ Release 2.4.0 - UNRELEASED YARN-1579. ActiveRMInfoProto fields should be optional (kasha) + YARN-888. Cleaned up POM files so that non-leaf modules don't include any + dependencies and thus compact the dependency list for leaf modules. + (Alejandro Abdelnur via vinodkv) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml index 315a0be6614..5960316ec0c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml @@ -32,6 +32,56 @@ ${project.parent.basedir} + + + commons-lang + commons-lang + + + com.google.guava + guava + + + commons-logging + commons-logging + + + + + org.apache.hadoop + hadoop-common + provided + + + commons-el + commons-el + + + tomcat + jasper-runtime + + + tomcat + jasper-compiler + + + org.mortbay.jetty + jsp-2.1-jetty + + + + + + + org.apache.hadoop + hadoop-annotations + + + com.google.protobuf + protobuf-java + + + 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 f81efdccfc3..4fd3e8e8bba 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 @@ -33,33 +33,101 @@ + + + org.apache.hadoop + hadoop-common + provided + + + commons-el + commons-el + + + tomcat + jasper-runtime + + + tomcat + jasper-compiler + + + org.mortbay.jetty + jsp-2.1-jetty + + + + + + junit + junit + test + + + + log4j + log4j + + + commons-lang + commons-lang + + + com.google.guava + guava + + + commons-logging + commons-logging + + + commons-cli + commons-cli + + + commons-io + commons-io + + + + org.apache.hadoop + hadoop-annotations + + + + org.apache.hadoop + hadoop-common + test-jar + test + + org.apache.hadoop hadoop-yarn-api + org.apache.hadoop hadoop-yarn-common + org.apache.hadoop hadoop-yarn-client + org.apache.hadoop hadoop-yarn-server-nodemanager test + org.apache.hadoop hadoop-yarn-server-resourcemanager test - - org.apache.hadoop - hadoop-yarn-server-common - test - + org.apache.hadoop hadoop-yarn-server-tests 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 43b75748715..c1944ea1d2c 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 @@ -34,42 +34,60 @@ - org.apache.hadoop - hadoop-yarn-api - - - org.apache.hadoop - hadoop-yarn-common - - - org.apache.hadoop - hadoop-yarn-server-nodemanager + junit + junit test - org.apache.hadoop - hadoop-yarn-server-resourcemanager - test + commons-logging + commons-logging + + + commons-cli + commons-cli org.apache.hadoop - hadoop-yarn-server-resourcemanager - test + hadoop-common + provided + + + commons-el + commons-el + + + tomcat + jasper-runtime + + + tomcat + jasper-compiler + + + org.mortbay.jetty + jsp-2.1-jetty + + + + + + org.apache.hadoop + hadoop-common test-jar - - - org.apache.hadoop - hadoop-yarn-server-common test + org.apache.hadoop hadoop-yarn-client org.apache.hadoop - hadoop-mapreduce-client-core - test + hadoop-yarn-api + + + org.apache.hadoop + hadoop-yarn-common org.apache.hadoop diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml index de466342907..21cddd68745 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml @@ -32,6 +32,8 @@ ${basedir}/../../../../hadoop-common-project/hadoop-common/target + + hadoop-yarn-applications-distributedshell hadoop-yarn-applications-unmanaged-am-launcher 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 14cb05834e2..1cf44299b89 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml @@ -30,37 +30,121 @@ + + + org.apache.hadoop + hadoop-common + provided + + + commons-el + commons-el + + + tomcat + jasper-runtime + + + tomcat + jasper-compiler + + + org.mortbay.jetty + jsp-2.1-jetty + + + + + + com.google.guava + guava + + + commons-logging + commons-logging + + + commons-lang + commons-lang + + + commons-cli + commons-cli + + + log4j + log4j + + + org.mortbay.jetty + jetty-util + + + + + org.apache.hadoop + hadoop-annotations + + + org.mockito + mockito-all + test + + + + org.apache.hadoop + hadoop-common + test-jar + test + + org.apache.zookeeper zookeeper test-jar test + + junit + junit + test + + org.apache.hadoop hadoop-yarn-api - + + org.apache.hadoop hadoop-yarn-common - + + + org.apache.hadoop + hadoop-yarn-server-common + test + + + org.apache.hadoop hadoop-yarn-server-resourcemanager test - + + org.apache.hadoop hadoop-yarn-server-tests test test-jar - - org.apache.hadoop - hadoop-yarn-server-resourcemanager - test - test-jar - + + + org.apache.hadoop + hadoop-yarn-server-resourcemanager + test + test-jar + 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 c8913cc8598..17fe43d57b1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -33,15 +33,137 @@ - - log4j - log4j - - - - org.apache.hadoop - hadoop-yarn-api - + + + org.apache.hadoop + hadoop-common + provided + + + commons-el + commons-el + + + tomcat + jasper-runtime + + + tomcat + jasper-compiler + + + org.mortbay.jetty + jsp-2.1-jetty + + + + + + + org.apache.hadoop + hadoop-yarn-api + + + + javax.xml.bind + jaxb-api + + + org.apache.commons + commons-compress + + + commons-lang + commons-lang + + + javax.servlet + servlet-api + + + commons-codec + commons-codec + + + com.sun.jersey + jersey-core + + + org.codehaus.jackson + jackson-mapper-asl + + + com.google.guava + guava + + + commons-logging + commons-logging + + + commons-cli + commons-cli + + + + + org.slf4j + slf4j-api + + + + org.apache.hadoop + hadoop-annotations + + + org.mockito + mockito-all + test + + + + org.apache.hadoop + hadoop-common + test-jar + test + + + com.google.inject.extensions + guice-servlet + + + com.google.protobuf + protobuf-java + + + junit + junit + test + + + commons-io + commons-io + + + com.google.inject + guice + + + com.sun.jersey + jersey-server + + + com.sun.jersey + jersey-json + + + com.sun.jersey.contribs + jersey-guice + + + log4j + log4j + 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 50932d1c308..c01aa56bb5d 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 @@ -33,10 +33,72 @@ + + + org.apache.hadoop + hadoop-common + provided + + + commons-el + commons-el + + + tomcat + jasper-runtime + + + tomcat + jasper-compiler + + + org.mortbay.jetty + jsp-2.1-jetty + + + + + + org.apache.hadoop + hadoop-common + test-jar + test + + + + + org.apache.hadoop + hadoop-yarn-api + + org.apache.hadoop hadoop-yarn-common + + + com.google.guava + guava + + + commons-logging + commons-logging + + + + + org.apache.hadoop + hadoop-annotations + + + com.google.protobuf + protobuf-java + + + junit + junit + test + org.apache.zookeeper zookeeper 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 b50546bd2d2..8257c551d6b 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 @@ -35,6 +35,141 @@ + + + org.apache.hadoop + hadoop-common + provided + + + commons-el + commons-el + + + tomcat + jasper-runtime + + + tomcat + jasper-compiler + + + org.mortbay.jetty + jsp-2.1-jetty + + + + + + + org.apache.hadoop + hadoop-yarn-common + + + + org.apache.hadoop + hadoop-yarn-api + + + javax.xml.bind + jaxb-api + + + org.codehaus.jettison + jettison + + + commons-lang + commons-lang + + + javax.servlet + servlet-api + + + commons-codec + commons-codec + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-client + + + org.mortbay.jetty + jetty-util + + + com.google.guava + guava + + + commons-logging + commons-logging + + + + org.slf4j + slf4j-api + + + + org.apache.hadoop + hadoop-annotations + + + org.mockito + mockito-all + test + + + + org.apache.hadoop + hadoop-common + test-jar + test + + + com.google.inject.extensions + guice-servlet + + + com.google.protobuf + protobuf-java + + + junit + junit + test + + + com.google.inject + guice + + + com.sun.jersey.jersey-test-framework + jersey-test-framework-grizzly2 + test + + + com.sun.jersey + jersey-json + + + com.sun.jersey.contribs + jersey-guice + + + + org.apache.hadoop + hadoop-yarn-common + test-jar + test + + org.apache.hadoop hadoop-yarn-server-common 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 d915ec60a24..7bbe14e6aa7 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 @@ -33,10 +33,156 @@ + + javax.servlet + servlet-api + + + + org.apache.hadoop + hadoop-common + provided + + + commons-el + commons-el + + + tomcat + jasper-runtime + + + tomcat + jasper-compiler + + + org.mortbay.jetty + jsp-2.1-jetty + + + + + + org.slf4j + slf4j-api + + + + org.apache.hadoop + hadoop-annotations + + + org.mockito + mockito-all + test + + + + org.apache.hadoop + hadoop-common + test-jar + test + + + com.google.inject.extensions + guice-servlet + + + com.google.protobuf + protobuf-java + + + junit + junit + test + + + commons-io + commons-io + + + + org.apache.hadoop + hadoop-hdfs + test + + + com.google.inject + guice + + + com.sun.jersey.jersey-test-framework + jersey-test-framework-core + test + + + com.sun.jersey + jersey-json + + + com.sun.jersey.contribs + jersey-guice + + + + org.apache.hadoop + hadoop-yarn-common + test-jar + test + + + + org.apache.hadoop + hadoop-yarn-common + + + + org.apache.hadoop + hadoop-yarn-api + + + javax.xml.bind + jaxb-api + + + org.codehaus.jettison + jettison + + + commons-lang + commons-lang + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-client + + + org.mortbay.jetty + jetty-util + + + com.google.guava + guava + + + commons-logging + commons-logging + + + log4j + log4j + + + org.apache.hadoop hadoop-yarn-server-common + org.apache.hadoop hadoop-yarn-server-web-proxy @@ -51,12 +197,20 @@ test-jar test + org.apache.hadoop hadoop-hdfs test-jar test + + + + com.sun.jersey.jersey-test-framework + jersey-test-framework-grizzly2 + test + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml index 2b6d20eb88c..3f24872373f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml @@ -32,29 +32,101 @@ + + + org.apache.hadoop + hadoop-common + provided + + + commons-el + commons-el + + + tomcat + jasper-runtime + + + tomcat + jasper-compiler + + + org.mortbay.jetty + jsp-2.1-jetty + + + + + + org.apache.hadoop + hadoop-common + test-jar + test + + + + + org.apache.hadoop + hadoop-annotations + + + junit + junit + test + + + + org.apache.hadoop + hadoop-yarn-common + test-jar + test + + org.apache.hadoop hadoop-yarn-server-common + org.apache.hadoop hadoop-yarn-server-nodemanager + org.apache.hadoop hadoop-yarn-server-resourcemanager + org.apache.hadoop hadoop-yarn-server-resourcemanager test-jar test + org.apache.hadoop hadoop-minikdc test + + + org.apache.hadoop + hadoop-yarn-common + + + + org.apache.hadoop + hadoop-yarn-api + + + com.google.guava + guava + + + commons-logging + commons-logging + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml index ad15392a5f1..4b1984f8b28 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml @@ -38,14 +38,94 @@ servlet-api compile + + + org.apache.hadoop + hadoop-common + provided + + + commons-el + commons-el + + + tomcat + jasper-runtime + + + tomcat + jasper-compiler + + + org.mortbay.jetty + jsp-2.1-jetty + + + + + + org.apache.hadoop + hadoop-common + test-jar + test + + + + org.mockito + mockito-all + test + + + junit + junit + test + + org.apache.hadoop hadoop-yarn-server-common + org.apache.hadoop hadoop-yarn-common + + + org.apache.hadoop + hadoop-yarn-api + + + + commons-httpclient + commons-httpclient + + + com.google.guava + guava + + + commons-logging + commons-logging + + + org.mortbay.jetty + jetty + + + + org.glassfish.grizzly + grizzly-http-servlet + test + + + + + com.sun.jersey.jersey-test-framework + jersey-test-framework-grizzly2 + test + + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml index 3e3b52bd112..45eb449830e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml @@ -32,14 +32,7 @@ ${basedir}/../../../../hadoop-common-project/hadoop-common/target - - - org.apache.hadoop - hadoop-yarn-common - test-jar - test - - + hadoop-yarn-server-common diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/pom.xml index a516a7645c7..e3d57d9ab94 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/pom.xml @@ -26,10 +26,13 @@ hadoop-yarn-site 2.4.0-SNAPSHOT hadoop-yarn-site + pom ${project.parent.parent.basedir} + + diff --git a/hadoop-yarn-project/hadoop-yarn/pom.xml b/hadoop-yarn-project/hadoop-yarn/pom.xml index 26b937ec94d..6027964c828 100644 --- a/hadoop-yarn-project/hadoop-yarn/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/pom.xml @@ -33,112 +33,7 @@ ${basedir}/../../../hadoop-common-project/hadoop-common/target - - - org.apache.hadoop - hadoop-common - provided - - - commons-el - commons-el - - - tomcat - jasper-runtime - - - tomcat - jasper-compiler - - - org.mortbay.jetty - jsp-2.1-jetty - - - - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - - - org.apache.hadoop - hadoop-annotations - - - org.mockito - mockito-all - test - - - org.apache.hadoop - hadoop-common - test-jar - test - - - com.google.inject.extensions - guice-servlet - - - io.netty - netty - - - com.google.protobuf - protobuf-java - - - junit - junit - test - - - commons-io - commons-io - - - org.apache.hadoop - hadoop-hdfs - test - - - com.google.inject - guice - - - cglib - cglib - provided - - - com.sun.jersey.jersey-test-framework - jersey-test-framework-core - test - - - com.sun.jersey.jersey-test-framework - jersey-test-framework-grizzly2 - test - - - com.sun.jersey - jersey-server - - - com.sun.jersey - jersey-json - - - com.sun.jersey.contribs - jersey-guice - - + diff --git a/hadoop-yarn-project/pom.xml b/hadoop-yarn-project/pom.xml index 7b0cf70a3b5..cb0750a51db 100644 --- a/hadoop-yarn-project/pom.xml +++ b/hadoop-yarn-project/pom.xml @@ -41,132 +41,7 @@ hadoop-yarn - - - com.google.protobuf - protobuf-java - - - org.apache.avro - avro - - - org.mortbay.jetty - jetty - - - org.apache.ant - ant - - - io.netty - netty - - - org.apache.velocity - velocity - - - org.slf4j - slf4j-api - - - paranamer-ant - com.thoughtworks.paranamer - - - - - org.apache.hadoop - hadoop-common - provided - - - commons-el - commons-el - - - tomcat - jasper-runtime - - - tomcat - jasper-compiler - - - org.mortbay.jetty - jsp-2.1-jetty - - - - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - - - org.apache.hadoop - hadoop-annotations - - - org.mockito - mockito-all - test - - - org.apache.hadoop - hadoop-common - test-jar - test - - - org.apache.hadoop - hadoop-hdfs - test - - - com.google.inject - guice - - - cglib - cglib - - - com.sun.jersey - jersey-server - - - com.sun.jersey.contribs - jersey-guice - - - com.google.inject.extensions - guice-servlet - - - junit - junit - - - io.netty - netty - - - commons-io - commons-io - - - org.hsqldb - hsqldb - compile - - - +