Repository: hadoop Updated Branches: refs/heads/HDFS-7240 7ace05b3f -> b49ec7320
HDFS-13317. Ozone: docker-compose should only be copied to hadoop-dist if Phdsl is enabled. Contributed by Xiaoyu Yao. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b49ec732 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b49ec732 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b49ec732 Branch: refs/heads/HDFS-7240 Commit: b49ec73204e764516bc104a83ac9ec7e1ba2ce20 Parents: 7ace05b Author: Xiaoyu Yao <x...@apache.org> Authored: Wed Mar 21 10:49:15 2018 -0700 Committer: Xiaoyu Yao <x...@apache.org> Committed: Wed Mar 21 10:49:15 2018 -0700 ---------------------------------------------------------------------- hadoop-dist/pom.xml | 78 +++++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b49ec732/hadoop-dist/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml index 6d4798e..98a9edf 100644 --- a/hadoop-dist/pom.xml +++ b/hadoop-dist/pom.xml @@ -142,43 +142,6 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-docker-compose</id> - <goals> - <goal>copy-resources</goal> - </goals> - <phase>prepare-package</phase> - <configuration> - <outputDirectory>${project.build.directory}/compose</outputDirectory> - <resources> - <resource> - <directory>src/main/compose</directory> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-dockerfile</id> - <goals> - <goal>copy-resources</goal> - </goals> - <phase>prepare-package</phase> - <configuration> - <outputDirectory>${project.build.directory}</outputDirectory> - <resources> - <resource> - <directory>src/main/docker</directory> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> @@ -299,6 +262,47 @@ <artifactId>hadoop-cblock-tools</artifactId> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-docker-compose</id> + <goals> + <goal>copy-resources</goal> + </goals> + <phase>prepare-package</phase> + <configuration> + <outputDirectory>${project.build.directory}/compose</outputDirectory> + <resources> + <resource> + <directory>src/main/compose</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-dockerfile</id> + <goals> + <goal>copy-resources</goal> + </goals> + <phase>prepare-package</phase> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + <resources> + <resource> + <directory>src/main/docker</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </profile> </profiles> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
