Updated Branches: refs/heads/master ce34dd40b -> a0d3c6977
Address issue where binary tarball was including both rebuffed and non rebuffed jars. Address issue where binary tarball wasn't including sample-data directory Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/c211df00 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/c211df00 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/c211df00 Branch: refs/heads/master Commit: c211df00c4c9fe1ab85b4753b79ce7080a334d06 Parents: ce34dd4 Author: Jacques Nadeau <[email protected]> Authored: Fri Sep 6 12:50:41 2013 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Fri Sep 6 12:54:16 2013 -0700 ---------------------------------------------------------------------- distribution/src/assemble/bin.xml | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/c211df00/distribution/src/assemble/bin.xml ---------------------------------------------------------------------- diff --git a/distribution/src/assemble/bin.xml b/distribution/src/assemble/bin.xml index cb8bb71..fe76c67 100644 --- a/distribution/src/assemble/bin.xml +++ b/distribution/src/assemble/bin.xml @@ -1,6 +1,7 @@ -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> <id>binary-release</id> <formats> <format>tar.gz</format> @@ -8,10 +9,16 @@ <includeBaseDirectory>true</includeBaseDirectory> <moduleSets> <moduleSet> - + <!-- Enable access to all projects in the current multimodule build! --> <useAllReactorProjects>true</useAllReactorProjects> - + + <!-- Now, select which projects to include in this module-set. --> + <includes> + <include>org.apache.drill:sqlparser:jar</include> + <include>org.apache.drill.exec:netty-bufferl</include> + <include>org.apache.drill.exec:ref</include> + </includes> <binaries> <outputDirectory>jars</outputDirectory> <unpack>false</unpack> @@ -40,6 +47,14 @@ <scope>test</scope> </dependencySet> </dependencySets> + + <fileSets> + <fileSet> + <directory>../sample-data</directory> + <outputDirectory>sample-data</outputDirectory> + </fileSet> + </fileSets> + <files> <file> <source>../common/target/common-${project.version}-rebuffed.jar</source> @@ -89,5 +104,5 @@ <source>src/resources/storage-engines.json</source> <outputDirectory>conf</outputDirectory> </file> - </files> + </files> </assembly>
