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 @@ -classpath -Ddruid.extensions.loadList=[] + -Ddruid.extensions.directory=${project.build.directory}/druid_extensions + -Ddruid.extensions.hadoopDependenciesDir=${project.build.directory}/hadoop_druid_dependencies io.druid.cli.Main tools pull-deps @@ -140,20 +142,6 @@ - - org.apache.maven.plugins - maven-clean-plugin - - - - ${project.basedir}/druid_extensions - - - ${project.basedir}/hadoop_druid_dependencies - - - - 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 @@ - druid_extensions + ${project.build.directory}/druid_extensions */* @@ -35,7 +35,7 @@ druid_extensions - hadoop_druid_dependencies + ${project.build.directory}/hadoop_druid_dependencies */*/* 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 @@ - druid_extensions/mysql-metadata-storage + ${project.build.directory}/druid_extensions/mysql-metadata-storage *