Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1893 from guobingkun/move_distribution_artifacts 

move distribution artifacts to distribution/target
This commit is contained in:
Gian Merlino 2015-10-31 13:37:08 -07:00
parent f90ddfdb89 dffa89a5bf
commit 0eead6154a
4 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -13,5 +13,3 @@ target
*.log *.log
*.DS_Store *.DS_Store
_site _site
/distribution/druid_extensions
/distribution/hadoop_druid_dependencies

16
distribution/pom.xml
View File

@ -57,6 +57,8 @@
<argument>-classpath</argument> <argument>-classpath</argument>
<classpath/> <classpath/>
<argument>-Ddruid.extensions.loadList=[]</argument> <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>io.druid.cli.Main</argument>
<argument>tools</argument> <argument>tools</argument>
<argument>pull-deps</argument> <argument>pull-deps</argument>
@ -140,20 +142,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </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> </plugins>
</build> </build>
</project> </project>

4
distribution/src/assembly/assembly.xml
View File

@ -25,7 +25,7 @@
</formats> </formats>
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>druid_extensions</directory> <directory>${project.build.directory}/druid_extensions</directory>
<includes> <includes>
<include>*/*</include> <include>*/*</include>
</includes> </includes>
@ -35,7 +35,7 @@
<outputDirectory>druid_extensions</outputDirectory> <outputDirectory>druid_extensions</outputDirectory>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>hadoop_druid_dependencies</directory> <directory>${project.build.directory}/hadoop_druid_dependencies</directory>
<includes> <includes>
<include>*/*/*</include> <include>*/*/*</include>
</includes> </includes>

2
distribution/src/assembly/mysql_assembly.xml
View File

@ -25,7 +25,7 @@
</formats> </formats>
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>druid_extensions/mysql-metadata-storage</directory> <directory>${project.build.directory}/druid_extensions/mysql-metadata-storage</directory>
<includes> <includes>
<include>*</include> <include>*</include>
</includes> </includes>