From dffa89a5bf70de9330755341de854d9863493352 Mon Sep 17 00:00:00 2001
From: Bingkun Guo <guobingkun@yahoo-inc.com>
Date: Fri, 30 Oct 2015 10:01:14 -0500
Subject: [PATCH] move distribution artifacts to distribution/target

---
 .gitignore                                   |  2 --
 distribution/pom.xml                         | 16 ++--------------
 distribution/src/assembly/assembly.xml       |  4 ++--
 distribution/src/assembly/mysql_assembly.xml |  2 +-
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8f51c802072..c7f1290850b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,5 +13,3 @@ target
 *.log
 *.DS_Store
 _site
-/distribution/druid_extensions
-/distribution/hadoop_druid_dependencies
diff --git a/distribution/pom.xml b/distribution/pom.xml
index d58e9f2782d..a114a39af78 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -57,6 +57,8 @@
                                 <argument>-classpath</argument>
                                 <classpath/>
                                 <argument>-Ddruid.extensions.loadList=[]</argument>
+                                <argument>-Ddruid.extensions.directory=${project.build.directory}/druid_extensions</argument>
+                                <argument>-Ddruid.extensions.hadoopDependenciesDir=${project.build.directory}/hadoop_druid_dependencies</argument>
                                 <argument>io.druid.cli.Main</argument>
                                 <argument>tools</argument>
                                 <argument>pull-deps</argument>
@@ -140,20 +142,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>${project.basedir}/druid_extensions</directory>
-                        </fileset>
-                        <fileset>
-                            <directory>${project.basedir}/hadoop_druid_dependencies</directory>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/distribution/src/assembly/assembly.xml b/distribution/src/assembly/assembly.xml
index caba48d4e2b..00207910aa7 100644
--- a/distribution/src/assembly/assembly.xml
+++ b/distribution/src/assembly/assembly.xml
@@ -25,7 +25,7 @@
     </formats>
     <fileSets>
         <fileSet>
-            <directory>druid_extensions</directory>
+            <directory>${project.build.directory}/druid_extensions</directory>
             <includes>
                 <include>*/*</include>
             </includes>
@@ -35,7 +35,7 @@
             <outputDirectory>druid_extensions</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>hadoop_druid_dependencies</directory>
+            <directory>${project.build.directory}/hadoop_druid_dependencies</directory>
             <includes>
                 <include>*/*/*</include>
             </includes>
diff --git a/distribution/src/assembly/mysql_assembly.xml b/distribution/src/assembly/mysql_assembly.xml
index 8335ea3fea6..011cd31c8ff 100644
--- a/distribution/src/assembly/mysql_assembly.xml
+++ b/distribution/src/assembly/mysql_assembly.xml
@@ -25,7 +25,7 @@
     </formats>
     <fileSets>
         <fileSet>
-            <directory>druid_extensions/mysql-metadata-storage</directory>
+            <directory>${project.build.directory}/druid_extensions/mysql-metadata-storage</directory>
             <includes>
                 <include>*</include>
             </includes>