Repository: hadoop Updated Branches: refs/heads/HDFS-7240 ac77b1803 -> f3447873c
HDFS-13391. Ozone: Make dependency of internal sub-module scope as provided in maven. Contributed by Nanda kumar. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f3447873 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f3447873 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f3447873 Branch: refs/heads/HDFS-7240 Commit: f3447873c2b6befeee7a98c7cfead3b6d7acd5bb Parents: ac77b18 Author: Nanda kumar <[email protected]> Authored: Wed Apr 4 08:59:01 2018 +0530 Committer: Nanda kumar <[email protected]> Committed: Wed Apr 4 08:59:01 2018 +0530 ---------------------------------------------------------------------- dev-support/bin/dist-layout-stitching | 12 +++-- 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 | 53 ++++---------------- 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 ++++++++++--- 17 files changed, 179 insertions(+), 184 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3447873/dev-support/bin/dist-layout-stitching ---------------------------------------------------------------------- diff --git a/dev-support/bin/dist-layout-stitching b/dev-support/bin/dist-layout-stitching index cf557bf..edb0b1d 100755 --- a/dev-support/bin/dist-layout-stitching +++ b/dev-support/bin/dist-layout-stitching @@ -144,16 +144,22 @@ run cp -p "${ROOT}/hadoop-client-modules/hadoop-client-api/target/hadoop-client- run cp -p "${ROOT}/hadoop-client-modules/hadoop-client-runtime/target/hadoop-client-runtime-${VERSION}.jar" share/hadoop/client/ run cp -p "${ROOT}/hadoop-client-modules/hadoop-client-minicluster/target/hadoop-client-minicluster-${VERSION}.jar" share/hadoop/client/ +# HDSL run copy "${ROOT}/hadoop-hdsl/common/target/hadoop-hdsl-common-${VERSION}" . run copy "${ROOT}/hadoop-hdsl/framework/target/hadoop-hdsl-server-framework-${VERSION}" . run copy "${ROOT}/hadoop-hdsl/server-scm/target/hadoop-hdsl-server-scm-${VERSION}" . -run copy "${ROOT}/hadoop-hdsl/tools/target/hadoop-hdsl-tools-${VERSION}" . run copy "${ROOT}/hadoop-hdsl/container-service/target/hadoop-hdsl-container-service-${VERSION}" . +run copy "${ROOT}/hadoop-hdsl/client/target/hadoop-hdsl-client-${VERSION}" . +run copy "${ROOT}/hadoop-hdsl/tools/target/hadoop-hdsl-tools-${VERSION}" . + +# Ozone run copy "${ROOT}/hadoop-ozone/common/target/hadoop-ozone-common-${VERSION}" . run copy "${ROOT}/hadoop-ozone/ozone-manager/target/hadoop-ozone-ozone-manager-${VERSION}" . -run copy "${ROOT}/hadoop-ozone/ozone-client/target/hadoop-ozone-client-${VERSION}" . -run copy "${ROOT}/hadoop-ozone/tools/target/hadoop-ozone-tools-${VERSION}" . run copy "${ROOT}/hadoop-ozone/objectstore-service/target/hadoop-ozone-objectstore-service-${VERSION}" . +run copy "${ROOT}/hadoop-ozone/client/target/hadoop-ozone-client-${VERSION}" . +run copy "${ROOT}/hadoop-ozone/tools/target/hadoop-ozone-tools-${VERSION}" . + +# CBlock run copy "${ROOT}/hadoop-cblock/server/target/hadoop-cblock-server-${VERSION}" . run copy "${ROOT}/hadoop-cblock/tools/target/hadoop-cblock-tools-${VERSION}" . http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3447873/hadoop-cblock/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-cblock/pom.xml b/hadoop-cblock/pom.xml index c6eb33e..a713654 100644 --- a/hadoop-cblock/pom.xml +++ b/hadoop-cblock/pom.xml @@ -36,6 +36,11 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <dependencies> <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <scope>compile</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3447873/hadoop-hdsl/client/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdsl/client/pom.xml b/hadoop-hdsl/client/pom.xml index af03ca2..1f1eaf0 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";> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdsl-common</artifactId> + <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3447873/hadoop-hdsl/common/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdsl/common/pom.xml b/hadoop-hdsl/common/pom.xml index 299b79f..c2323af 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";> </properties> <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs-client</artifactId> - </dependency> - - <!-- ideally it should be removed. Required by metadata -> batch operation - and Storage ContainerDatanodeProtocol --> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.fusesource.leveldbjni</groupId> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3447873/hadoop-hdsl/container-service/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdsl/container-service/pom.xml b/hadoop-hdsl/container-service/pom.xml index 4e2d287..7d6d543 100644 --- a/hadoop-hdsl/container-service/pom.xml +++ b/hadoop-hdsl/container-service/pom.xml @@ -36,29 +36,13 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdsl-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdsl-server-framework</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <scope>test</scope> - <type>test-jar</type> + <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3447873/hadoop-hdsl/framework/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdsl/framework/pom.xml b/hadoop-hdsl/framework/pom.xml index 2c38573..44ef7fe 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";> </properties> <dependencies> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - </dependency> - <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdsl-common</artifactId> + <scope>provided</scope> </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - </dependency> - </dependencies> <build> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3447873/hadoop-hdsl/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdsl/pom.xml b/hadoop-hdsl/pom.xml index e6f856e..0a40fbb 100644 --- a/hadoop-hdsl/pom.xml +++ b/hadoop-hdsl/pom.xml @@ -41,6 +41,43 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <dependencies> <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs-client</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <scope>test</scope> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <scope>test</scope> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <scope>compile</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3447873/hadoop-hdsl/server-scm/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdsl/server-scm/pom.xml b/hadoop-hdsl/server-scm/pom.xml index 802120b..e7b8bf0 100644 --- a/hadoop-hdsl/server-scm/pom.xml +++ b/hadoop-hdsl/server-scm/pom.xml @@ -37,44 +37,29 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdsl-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdsl-container-service</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdsl-client</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdsl-server-framework</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdsl-container-service</artifactId> <scope>test</scope> <type>test-jar</type> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3447873/hadoop-hdsl/tools/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdsl/tools/pom.xml b/hadoop-hdsl/tools/pom.xml index c18b185..7a5eb0a 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";> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdsl-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdsl-client</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>commons-cli</groupId> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3447873/hadoop-ozone/client/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-ozone/client/pom.xml b/hadoop-ozone/client/pom.xml index 8ce22f7..b1eb587 100644 --- a/hadoop-ozone/client/pom.xml +++ b/hadoop-ozone/client/pom.xml @@ -36,27 +36,8 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdsl-common</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-ozone-common</artifactId> + <scope>provided</scope> </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdsl-client</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - </dependencies> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3447873/hadoop-ozone/common/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml index 8092257..40b905a 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";> </properties> <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdsl-server-framework</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdsl-common</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3447873/hadoop-ozone/integration-test/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml index 64e4979..9d975539 100644 --- a/hadoop-ozone/integration-test/pom.xml +++ b/hadoop-ozone/integration-test/pom.xml @@ -32,63 +32,28 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-ozone-manager</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-tools</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdsl-tools</artifactId> + <artifactId>hadoop-ozone-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdsl-server-scm</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdsl-container-service</artifactId> + <artifactId>hadoop-ozone-ozone-manager</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-ozone-objectstore-service</artifactId> + <scope>provided</scope> </dependency> - - <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdsl-server-scm</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <scope>test</scope> - <type>test-jar</type> - <exclusions> - <exclusion> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - </exclusion> - <exclusion> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - </exclusion> - </exclusions> + <artifactId>hadoop-ozone-client</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdsl-container-service</artifactId> - <scope>test</scope> - <type>test-jar</type> + <artifactId>hadoop-ozone-tools</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3447873/hadoop-ozone/objectstore-service/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-ozone/objectstore-service/pom.xml b/hadoop-ozone/objectstore-service/pom.xml index de62f31..8cfe037 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";> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-ozone-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-ozone-client</artifactId> + <scope>provided</scope> </dependency> <dependency> @@ -59,11 +61,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdsl-container-service</artifactId> - </dependency> - </dependencies> <build> <plugins> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3447873/hadoop-ozone/ozone-manager/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml index 5136452..b0bc73d 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";> </properties> <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdsl-server-framework</artifactId> - </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-ozone-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-ozone-client</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdsl-common</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <scope>test</scope> - <type>test-jar</type> + <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3447873/hadoop-ozone/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml index 33e489a..6878f3c 100644 --- a/hadoop-ozone/pom.xml +++ b/hadoop-ozone/pom.xml @@ -40,6 +40,75 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <dependencies> <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs-client</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdsl-common</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdsl-server-framework</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdsl-server-scm</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdsl-container-service</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdsl-client</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdsl-tools</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <scope>test</scope> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <scope>test</scope> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdsl-server-scm</artifactId> + <scope>test</scope> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdsl-container-service</artifactId> + <scope>test</scope> + <type>test-jar</type> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3447873/hadoop-ozone/tools/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml index 129f47d..dcd2798 100644 --- a/hadoop-ozone/tools/pom.xml +++ b/hadoop-ozone/tools/pom.xml @@ -36,7 +36,13 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-ozone-common</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-ozone-client</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3447873/hadoop-tools/hadoop-ozone/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-ozone/pom.xml b/hadoop-tools/hadoop-ozone/pom.xml index df2f869..bab5bc2 100644 --- a/hadoop-tools/hadoop-ozone/pom.xml +++ b/hadoop-tools/hadoop-ozone/pom.xml @@ -68,6 +68,32 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs-client</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdsl-common</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-ozone-common</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-ozone-objectstore-service</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -78,7 +104,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-ozone-client</artifactId> - <scope>compile</scope> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -89,13 +115,9 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-ozone-integration-test</artifactId> + <scope>test</scope> <type>test-jar</type> </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs-client</artifactId> - <scope>compile</scope> - </dependency> <dependency> <groupId>org.mockito</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
