From 7ae9543a5781020f381fed5c05a251cacb7e6a0d Mon Sep 17 00:00:00 2001 From: Nanda kumar Date: Wed, 4 Apr 2018 08:59:01 +0530 Subject: [PATCH] HDFS-13391. Ozone: Make dependency of internal sub-module scope as provided in maven. Contributed by Nanda kumar. --- hadoop-cblock/pom.xml | 5 ++ hadoop-hdsl/client/pom.xml | 1 + hadoop-hdsl/common/pom.xml | 17 ------ hadoop-hdsl/container-service/pom.xml | 20 +------ hadoop-hdsl/framework/pom.xml | 13 +---- hadoop-hdsl/pom.xml | 37 +++++++++++++ hadoop-hdsl/server-scm/pom.xml | 23 ++------ hadoop-hdsl/tools/pom.xml | 3 ++ hadoop-ozone/client/pom.xml | 21 +------- hadoop-ozone/common/pom.xml | 20 ------- hadoop-ozone/integration-test/pom.xml | 57 ++++---------------- hadoop-ozone/objectstore-service/pom.xml | 7 +-- hadoop-ozone/ozone-manager/pom.xml | 22 +------- hadoop-ozone/pom.xml | 69 ++++++++++++++++++++++++ hadoop-ozone/tools/pom.xml | 6 +++ hadoop-tools/hadoop-ozone/pom.xml | 34 +++++++++--- 16 files changed, 172 insertions(+), 183 deletions(-) diff --git a/hadoop-cblock/pom.xml b/hadoop-cblock/pom.xml index c6eb33e075f..a713654f835 100644 --- a/hadoop-cblock/pom.xml +++ b/hadoop-cblock/pom.xml @@ -35,6 +35,11 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + org.apache.hadoop + hadoop-common + compile + junit junit diff --git a/hadoop-hdsl/client/pom.xml b/hadoop-hdsl/client/pom.xml index af03ca23b67..1f1eaf0e898 100644 --- a/hadoop-hdsl/client/pom.xml +++ b/hadoop-hdsl/client/pom.xml @@ -37,6 +37,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.hadoop hadoop-hdsl-common + provided diff --git a/hadoop-hdsl/common/pom.xml b/hadoop-hdsl/common/pom.xml index 299b79f208d..c2323af3a0d 100644 --- a/hadoop-hdsl/common/pom.xml +++ b/hadoop-hdsl/common/pom.xml @@ -34,23 +34,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-hdfs-client - - - - - org.apache.hadoop - hadoop-hdfs - provided - - org.fusesource.leveldbjni diff --git a/hadoop-hdsl/container-service/pom.xml b/hadoop-hdsl/container-service/pom.xml index 4e2d2871eac..7d6d5433963 100644 --- a/hadoop-hdsl/container-service/pom.xml +++ b/hadoop-hdsl/container-service/pom.xml @@ -34,31 +34,15 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - org.apache.hadoop - hadoop-hdfs - org.apache.hadoop hadoop-hdsl-common + provided org.apache.hadoop hadoop-hdsl-server-framework - - - - org.apache.hadoop - hadoop-common - test - test-jar - - - - org.apache.hadoop - hadoop-hdfs - test - test-jar + provided diff --git a/hadoop-hdsl/framework/pom.xml b/hadoop-hdsl/framework/pom.xml index 2c3857389bf..44ef7fedf6c 100644 --- a/hadoop-hdsl/framework/pom.xml +++ b/hadoop-hdsl/framework/pom.xml @@ -36,22 +36,11 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - - org.apache.hadoop - hadoop-hdfs - - org.apache.hadoop hadoop-hdsl-common + provided - - - org.apache.hadoop - hadoop-common - - diff --git a/hadoop-hdsl/pom.xml b/hadoop-hdsl/pom.xml index e6f856e4524..0a40fbb2622 100644 --- a/hadoop-hdsl/pom.xml +++ b/hadoop-hdsl/pom.xml @@ -40,6 +40,43 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + org.apache.hadoop + hadoop-common + provided + + + org.apache.hadoop + hadoop-hdfs + provided + + + org.apache.hadoop + hadoop-hdfs-client + provided + + + org.apache.hadoop + hadoop-common + test + test-jar + + + org.apache.hadoop + hadoop-hdfs + test + test-jar + + + com.google.protobuf + protobuf-java + compile + + + com.google.guava + guava + compile + junit junit diff --git a/hadoop-hdsl/server-scm/pom.xml b/hadoop-hdsl/server-scm/pom.xml index 802120be225..e7b8bf0e222 100644 --- a/hadoop-hdsl/server-scm/pom.xml +++ b/hadoop-hdsl/server-scm/pom.xml @@ -37,42 +37,27 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.hadoop hadoop-hdsl-common + provided org.apache.hadoop hadoop-hdsl-container-service + provided org.apache.hadoop hadoop-hdsl-client + provided org.apache.hadoop hadoop-hdsl-server-framework + provided - - org.apache.hadoop - hadoop-hdfs - - - - org.apache.hadoop - hadoop-common - test - test-jar - - - - - org.apache.hadoop - hadoop-hdfs - test - test-jar - org.apache.hadoop hadoop-hdsl-container-service diff --git a/hadoop-hdsl/tools/pom.xml b/hadoop-hdsl/tools/pom.xml index c18b185230f..7a5eb0a00b8 100644 --- a/hadoop-hdsl/tools/pom.xml +++ b/hadoop-hdsl/tools/pom.xml @@ -37,14 +37,17 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.hadoop hadoop-hdsl-common + provided org.apache.hadoop hadoop-hdsl-client + provided org.apache.hadoop hadoop-common + provided commons-cli diff --git a/hadoop-ozone/client/pom.xml b/hadoop-ozone/client/pom.xml index 8ce22f725ff..b1eb587c639 100644 --- a/hadoop-ozone/client/pom.xml +++ b/hadoop-ozone/client/pom.xml @@ -34,29 +34,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-hdsl-common - org.apache.hadoop hadoop-ozone-common + provided - - org.apache.hadoop - hadoop-hdsl-client - - - - org.apache.hadoop - hadoop-common - test - test-jar - - \ No newline at end of file diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml index 809225733c0..40b905a6ba0 100644 --- a/hadoop-ozone/common/pom.xml +++ b/hadoop-ozone/common/pom.xml @@ -34,26 +34,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-hdsl-server-framework - - - - org.apache.hadoop - hadoop-hdsl-common - - - - org.apache.hadoop - hadoop-common - test - test-jar - diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml index 64e49794f07..9d9755392f0 100644 --- a/hadoop-ozone/integration-test/pom.xml +++ b/hadoop-ozone/integration-test/pom.xml @@ -30,65 +30,30 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + org.apache.hadoop + hadoop-ozone-common + provided + org.apache.hadoop hadoop-ozone-ozone-manager - - - org.apache.hadoop - hadoop-ozone-tools - - - org.apache.hadoop - hadoop-hdsl-tools - - - org.apache.hadoop - hadoop-hdsl-server-scm - - - org.apache.hadoop - hadoop-hdsl-container-service + provided org.apache.hadoop hadoop-ozone-objectstore-service - - - - - org.apache.hadoop - hadoop-common - test - test-jar + provided org.apache.hadoop - hadoop-hdsl-server-scm - test - test-jar + hadoop-ozone-client + provided org.apache.hadoop - hadoop-hdfs - test - test-jar - - - org.hamcrest - hamcrest-all - - - org.hamcrest - hamcrest-core - - - - - org.apache.hadoop - hadoop-hdsl-container-service - test - test-jar + hadoop-ozone-tools + provided org.apache.hadoop diff --git a/hadoop-ozone/objectstore-service/pom.xml b/hadoop-ozone/objectstore-service/pom.xml index de62f31fa1a..8cfe037820c 100644 --- a/hadoop-ozone/objectstore-service/pom.xml +++ b/hadoop-ozone/objectstore-service/pom.xml @@ -38,11 +38,13 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.hadoop hadoop-ozone-common + provided org.apache.hadoop hadoop-ozone-client + provided @@ -59,11 +61,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> test - - org.apache.hadoop - hadoop-hdsl-container-service - - diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml index 513645221fd..b0bc73dc962 100644 --- a/hadoop-ozone/ozone-manager/pom.xml +++ b/hadoop-ozone/ozone-manager/pom.xml @@ -34,35 +34,17 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-hdsl-server-framework - org.apache.hadoop hadoop-ozone-common + provided org.apache.hadoop hadoop-ozone-client - - - - org.apache.hadoop - hadoop-hdsl-common - - - - org.apache.hadoop - hadoop-common - test - test-jar + provided diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml index 33e489afc9c..6878f3c93c4 100644 --- a/hadoop-ozone/pom.xml +++ b/hadoop-ozone/pom.xml @@ -39,6 +39,75 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + org.apache.hadoop + hadoop-common + provided + + + org.apache.hadoop + hadoop-hdfs + provided + + + org.apache.hadoop + hadoop-hdfs-client + provided + + + org.apache.hadoop + hadoop-hdsl-common + provided + + + org.apache.hadoop + hadoop-hdsl-server-framework + provided + + + org.apache.hadoop + hadoop-hdsl-server-scm + provided + + + org.apache.hadoop + hadoop-hdsl-container-service + provided + + + org.apache.hadoop + hadoop-hdsl-client + provided + + + org.apache.hadoop + hadoop-hdsl-tools + provided + + + org.apache.hadoop + hadoop-common + test + test-jar + + + org.apache.hadoop + hadoop-hdfs + test + test-jar + + + org.apache.hadoop + hadoop-hdsl-server-scm + test + test-jar + + + org.apache.hadoop + hadoop-hdsl-container-service + test + test-jar + junit junit diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml index 129f47d79cb..dcd279864d1 100644 --- a/hadoop-ozone/tools/pom.xml +++ b/hadoop-ozone/tools/pom.xml @@ -34,9 +34,15 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + org.apache.hadoop + hadoop-ozone-common + provided + org.apache.hadoop hadoop-ozone-client + provided io.dropwizard.metrics diff --git a/hadoop-tools/hadoop-ozone/pom.xml b/hadoop-tools/hadoop-ozone/pom.xml index 8a2176ccaa6..a58b8755a9f 100644 --- a/hadoop-tools/hadoop-ozone/pom.xml +++ b/hadoop-tools/hadoop-ozone/pom.xml @@ -68,6 +68,32 @@ org.apache.hadoop hadoop-common + provided + + + org.apache.hadoop + hadoop-hdfs + provided + + + org.apache.hadoop + hadoop-hdfs-client + provided + + + org.apache.hadoop + hadoop-hdsl-common + provided + + + org.apache.hadoop + hadoop-ozone-common + provided + + + org.apache.hadoop + hadoop-ozone-objectstore-service + provided org.apache.hadoop @@ -78,7 +104,7 @@ org.apache.hadoop hadoop-ozone-client - compile + provided org.apache.hadoop @@ -89,13 +115,9 @@ org.apache.hadoop hadoop-ozone-integration-test + test test-jar - - org.apache.hadoop - hadoop-hdfs-client - compile - org.mockito