DRILL-1281: Shaded hbase jar
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/a0a8256c Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/a0a8256c Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/a0a8256c Branch: refs/heads/master Commit: a0a8256c0f054e3754e9da18411859da27f9a1ca Parents: c3b15af Author: Steven Phillips <sphill...@maprtech.com> Authored: Mon Aug 18 14:16:26 2014 -0700 Committer: Steven Phillips <sphill...@maprtech.com> Committed: Mon Aug 18 14:46:48 2014 -0700 ---------------------------------------------------------------------- contrib/hbase-shaded/pom.xml | 373 ++++++++++++++++++++++++++++ contrib/pom.xml | 1 + distribution/pom.xml | 217 +++++++++++++--- distribution/src/assemble/bin-mapr.xml | 180 ++++++++++++++ distribution/src/assemble/bin.xml | 1 + pom.xml | 15 ++ 6 files changed, 753 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a0a8256c/contrib/hbase-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/hbase-shaded/pom.xml b/contrib/hbase-shaded/pom.xml new file mode 100644 index 0000000..cc61291 --- /dev/null +++ b/contrib/hbase-shaded/pom.xml @@ -0,0 +1,373 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; + xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.drill.contrib</groupId> + <artifactId>drill-contrib-parent</artifactId> + <version>0.5.0-incubating-SNAPSHOT</version> + </parent> + + <artifactId>drill-hbase-shaded</artifactId> + <packaging>jar</packaging> + <name>contrib/hbase-shaded</name> + + <properties> + <hbase.TestSuite>**/HBaseTestsSuite.class</hbase.TestSuite> + </properties> + + <profiles> + <profile> + <id>default-hadoop</id> + <activation> + <property> + <name>!alt-hadoop</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase</artifactId> + <version>0.94.11</version> + <exclusions> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-server</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-json</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-client</artifactId> + </exclusion> + <exclusion> + <artifactId>asm</artifactId> + <groupId>asm</groupId> + </exclusion> + <exclusion> + <artifactId>libthrift</artifactId> + <groupId>org.apache.thrift</groupId> + </exclusion> + <exclusion> + <artifactId>jruby-complete</artifactId> + <groupId>org.jruby</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <!-- contrary to other Drill modules, this HBase storage module + compiles against hadoop 1.x to allow running a mini HBase + cluster to run the unit tests. + This will change once we move to HBase 0.98 or later. + --> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + <version>1.2.1</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>asm</artifactId> + <groupId>asm</groupId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-json</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-server</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <artifactSet> + <includes> + <include>org.apache.hbase:hbase</include> + <include>org.apache.hadoop:hadoop-core</include> + </includes> + </artifactSet> + <createDependencyReducedPom>false</createDependencyReducedPom> + <promoteTransitiveDependencies>true</promoteTransitiveDependencies> + <relocations> + <relocation> + <pattern>org.apache.hadoop.net</pattern> + <shadedPattern>org.apache.hadoop1.net</shadedPattern> + </relocation> + </relocations> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>mapr</id> + <properties> + <alt-hadoop>mapr</alt-hadoop> + <rat.excludeSubprojects>true</rat.excludeSubprojects> + </properties> + <dependencies> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase</artifactId> + <version>0.94.17-mapr-1405-m7-4.0.0-FCS</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-server</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-json</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-client</artifactId> + </exclusion> + <exclusion> + <artifactId>asm</artifactId> + <groupId>asm</groupId> + </exclusion> + <exclusion> + <artifactId>libthrift</artifactId> + <groupId>org.apache.thrift</groupId> + </exclusion> + <exclusion> + <artifactId>jruby-complete</artifactId> + <groupId>org.jruby</groupId> + </exclusion> + <exclusion> + <artifactId>hadoop-core</artifactId> + <groupId>org.apache</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-test</artifactId> + <version>1.0.3-mapr-3.0.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase</artifactId> + <classifier>tests</classifier> + <version>0.94.13-mapr-1401-m7-3.0.2</version> + <scope>test</scope> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>asm</artifactId> + <groupId>asm</groupId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <filters> + <filter> + <artifact>org.apache.hadoop:hadoop-core</artifact> + <excludes> + <exclude>org.apache.hadoop.fs.*</exclude> + </excludes> + </filter> + </filters> + <artifactSet> + <includes> + <include>org.apache.hbase:hbase</include> + <include>org.apache.hadoop:hadoop-core</include> + </includes> + </artifactSet> + <createDependencyReducedPom>false</createDependencyReducedPom> + <promoteTransitiveDependencies>true</promoteTransitiveDependencies> + <relocations> + <relocation> + <pattern>org.apache.hadoop.net</pattern> + <shadedPattern>org.apache.hadoop1.net</shadedPattern> + </relocation> + </relocations> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>${hbase.TestSuite}</include> + </includes> + <systemProperties> + <property> + <name>hbase.test.root</name> + <value>${project.build.directory}/data</value> + </property> + <property> + <name>logback.log.dir</name> + <value>${project.build.directory}/surefire-reports</value> + </property> + </systemProperties> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <artifactSet> + <includes> + <include>org.apache.hbase:hbase</include> + <include>org.apache.hadoop:hadoop-core</include> + </includes> + </artifactSet> + <createDependencyReducedPom>false</createDependencyReducedPom> + <promoteTransitiveDependencies>true</promoteTransitiveDependencies> + <relocations> + <relocation> + <pattern>org.apache.hadoop.net</pattern> + <shadedPattern>org.apache.hadoop1.net</shadedPattern> + </relocation> + </relocations> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.8</version> + <executions> + <execution> + <id>unpack</id> + <phase>package</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.drill.contrib</groupId> + <artifactId>drill-hbase-shaded</artifactId> + <version>${project.version}</version> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/classes</outputDirectory> + <includes>**/**</includes> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a0a8256c/contrib/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/pom.xml b/contrib/pom.xml index de7709d..0c979e9 100644 --- a/contrib/pom.xml +++ b/contrib/pom.xml @@ -32,6 +32,7 @@ </dependencies> <modules> + <module>hbase-shaded</module> <module>storage-hbase</module> <module>storage-hive</module> <module>sqlline</module> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a0a8256c/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 1429902..0d493ce 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -62,17 +62,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.drill.contrib</groupId> - <artifactId>drill-storage-hbase</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.apache.drill.contrib.storage-hive</groupId> <artifactId>drill-storage-hive-core</artifactId> <version>${project.version}</version> @@ -103,33 +92,193 @@ </configuration> </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distro-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/assemble/bin.xml</descriptor> - </descriptors> - <appendAssemblyId>false</appendAssemblyId> - <finalName>apache-drill-${project.version}</finalName> - <tarLongFileMode>gnu</tarLongFileMode> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> - - - <profiles> <profile> + <id>default-hadoop</id> + <activation> + <property> + <name>!alt-hadoop</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.drill.contrib</groupId> + <artifactId>drill-storage-hbase</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.drill.contrib</groupId> + <artifactId>drill-hbase-shaded</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distro-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/assemble/bin.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + <finalName>apache-drill-${project.version}</finalName> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>mapr</id> + <dependencies> + <dependency> + <groupId>org.apache.drill.contrib</groupId> + <artifactId>drill-storage-hbase</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.mapr.hadoop</groupId> + <artifactId>maprfs</artifactId> + </dependency> + <!-- + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase</artifactId> + <version>0.94.17-mapr-1405-m7-4.0.0-FCS</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-server</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-json</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-client</artifactId> + </exclusion> + <exclusion> + <artifactId>asm</artifactId> + <groupId>asm</groupId> + </exclusion> + <exclusion> + <artifactId>libthrift</artifactId> + <groupId>org.apache.thrift</groupId> + </exclusion> + <exclusion> + <artifactId>jruby-complete</artifactId> + <groupId>org.jruby</groupId> + </exclusion> + <exclusion> + <artifactId>hadoop-core</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.mapr.hadoop</groupId> + <artifactId>maprfs</artifactId> + </dependency> + <dependency> + <groupId>com.mapr.fs</groupId> + <artifactId>libprotodefs</artifactId> + </dependency> + <dependency> + <groupId>com.mapr.fs</groupId> + <artifactId>mapr-hbase</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + </exclusions> + </dependency> + --> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distro-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/assemble/bin-mapr.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + <finalName>apache-drill-${project.version}</finalName> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>rpm</id> <build> <plugins> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a0a8256c/distribution/src/assemble/bin-mapr.xml ---------------------------------------------------------------------- diff --git a/distribution/src/assemble/bin-mapr.xml b/distribution/src/assemble/bin-mapr.xml new file mode 100644 index 0000000..ad7bb26 --- /dev/null +++ b/distribution/src/assemble/bin-mapr.xml @@ -0,0 +1,180 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<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> + <format>dir</format> + </formats> + <includeBaseDirectory>true</includeBaseDirectory> + <moduleSets> + + </moduleSets> + <dependencySets> +<!-- + <dependencySet> + <includes> + <include>org.apache.drill.exec:drill-jdbc-all:jar</include> + </includes> + <outputDirectory>jdbc-driver</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + </dependencySet> +--> + <dependencySet> + <!-- Now, select which projects to include in this module-set. --> + <includes> + <include>org.apache.drill.exec:drill-jdbc:jar</include> + <include>org.apache.drill:drill-protocol:jar:rebuffed</include> + <include>org.apache.drill:drill-common:jar:rebuffed</include> + <include>org.apache.drill.exec:drill-java-exec:jar:rebuffed</include> + <include>org.apache.drill.contrib.storage-hive:drill-storage-hive-core</include> + <include>org.apache.drill.contrib.storage-hive:drill-hive-exec-shaded</include> + <include>org.apache.drill.contrib.data:tpch-sample-data:jar</include> + <include>org.apache.drill.contrib:drill-storage-hbase</include> + </includes> + <excludes> + <exclude>org.apache.drill.contrib.storage-hive:drill-storage-hive-core:jar:tests</exclude> + </excludes> + <outputDirectory>jars</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + </dependencySet> + + <dependencySet> + <outputDirectory>lib</outputDirectory> + <unpack>false</unpack> + <useProjectArtifact>false</useProjectArtifact> + <excludes> + <exclude>org.apache.zookeeper</exclude> + <exclude>org.apache.drill</exclude> + <exclude>org.apache.drill.exec</exclude> + <exclude>org.apache.drill.contrib</exclude> + <exclude>org.apache.drill.contrib.storage-hive</exclude> + <exclude>org.hsqldb:hsqldb</exclude> + <!-- exclude or sqlline has problems --> + <exclude>hsqldb:hsqldb</exclude> + <!-- exclude or sqlline has problems --> + </excludes> + <scope>test</scope> + </dependencySet> + + <dependencySet> + <outputDirectory>extlib</outputDirectory> + <unpack>false</unpack> + <useProjectArtifact>false</useProjectArtifact> + <includes> + <include>org.apache.zookeeper:zookeeper</include> + </includes> + <scope>runtime</scope> + </dependencySet> + + <dependencySet> + <outputDirectory>lib</outputDirectory> + <unpack>false</unpack> + <useProjectArtifact>false</useProjectArtifact> + <includes> + <include>com.google.protobuf:protobuf-java:jar:2.5</include> + </includes> + <scope>test</scope> + </dependencySet> + + </dependencySets> + + <fileSets> + <fileSet> + <directory>../sample-data</directory> + <outputDirectory>sample-data</outputDirectory> + </fileSet> + </fileSets> + + <files> + <file> + <source>../KEYS</source> + <outputDirectory/> + </file> + <file> + <source>../LICENSE</source> + <outputDirectory/> + </file> + <file> + <source>../NOTICE</source> + <outputDirectory/> + </file> + <file> + <source>../git.properties</source> + <outputDirectory/> + </file> + <file> + <source>src/resources/runbit</source> + <fileMode>0755</fileMode> + <outputDirectory>bin</outputDirectory> + </file> + <file> + <source>src/resources/hadoop-excludes.txt</source> + <outputDirectory>bin</outputDirectory> + </file> + <file> + <source>src/resources/drillbit.sh</source> + <fileMode>0755</fileMode> + <outputDirectory>bin</outputDirectory> + </file> + <file> + <source>src/resources/drill-config.sh</source> + <fileMode>0755</fileMode> + <outputDirectory>bin</outputDirectory> + </file> + <file> + <source>src/resources/sqlline</source> + <fileMode>0755</fileMode> + <outputDirectory>bin</outputDirectory> + </file> + <file> + <source>src/resources/sqlline.bat</source> + <outputDirectory>bin</outputDirectory> + </file> + <file> + <source>src/resources/submit_plan</source> + <fileMode>0755</fileMode> + <outputDirectory>bin</outputDirectory> + </file> + <file> + <source>src/resources/drill_dumpcat</source> + <fileMode>0755</fileMode> + <outputDirectory>bin</outputDirectory> + </file> + <file> + <source>src/resources/drill-override.conf</source> + <outputDirectory>conf</outputDirectory> + </file> + <file> + <source>src/resources/logback.xml</source> + <outputDirectory>conf</outputDirectory> + </file> + <file> + <source>src/resources/drill-env.sh</source> + <fileMode>0755</fileMode> + <outputDirectory>conf</outputDirectory> + </file> + <file> + <source>src/resources/drill-override-example.conf</source> + <outputDirectory>conf</outputDirectory> + </file> + </files> +</assembly> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a0a8256c/distribution/src/assemble/bin.xml ---------------------------------------------------------------------- diff --git a/distribution/src/assemble/bin.xml b/distribution/src/assemble/bin.xml index 6d7fb6b..68b58bf 100644 --- a/distribution/src/assemble/bin.xml +++ b/distribution/src/assemble/bin.xml @@ -49,6 +49,7 @@ <include>org.apache.drill.contrib.storage-hive:drill-hive-exec-shaded</include> <include>org.apache.drill.contrib.data:tpch-sample-data:jar</include> <include>org.apache.drill.contrib:drill-storage-hbase</include> + <include>org.apache.drill.contrib:drill-hbase-shaded</include> </includes> <excludes> <exclude>org.apache.drill.contrib.storage-hive:drill-storage-hive-core:jar:tests</exclude> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a0a8256c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 457ef3e..f04d5b2 100644 --- a/pom.xml +++ b/pom.xml @@ -774,6 +774,21 @@ </exclusions> </dependency> <dependency> + <groupId>com.mapr.fs</groupId> + <artifactId>libprotodefs</artifactId> + <version>2.4.1-mapr-4.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>com.mapr.fs</groupId> + <artifactId>mapr-hbase</artifactId> + <version>2.4.1-mapr-4.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>com.mapr.hadoop</groupId> + <artifactId>maprfs</artifactId> + <version>2.4.1-mapr-4.0.0-SNAPSHOT</version> + </dependency> + <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <version>2.11.0</version>
