From 2078884b360db0e28fb5a3ad80b1dacedc09545d Mon Sep 17 00:00:00 2001
From: Xiaoyu Yao <xyao@apache.org>
Date: Wed, 21 Mar 2018 10:49:15 -0700
Subject: [PATCH] HDFS-13317. Ozone: docker-compose should only be copied to
 hadoop-dist if Phdsl is enabled. Contributed by Xiaoyu Yao.

---
 hadoop-dist/pom.xml | 78 ++++++++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 37 deletions(-)

diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml
index 6d4798e194..98a9edf709 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>