Maven cleanup & pom fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/b9e384dc Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/b9e384dc Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/b9e384dc Branch: refs/heads/master Commit: b9e384dc9a8889e5cb1a9ac05b48c6b99096fe73 Parents: 7cd659d Author: Jacques Nadeau <jacq...@apache.org> Authored: Fri Aug 29 19:35:07 2014 -0700 Committer: Jacques Nadeau <jacq...@apache.org> Committed: Sun Aug 31 10:27:19 2014 -0700 ---------------------------------------------------------------------- contrib/storage-hbase/pom.xml | 12 +- distribution/pom.xml | 241 ++--------------- exec/java-exec/pom.xml | 162 ++++-------- exec/jdbc-all/pom.xml | 10 +- exec/jdbc/pom.xml | 7 +- pom.xml | 518 +++++++++++++++++++++++++++++++++---- 6 files changed, 559 insertions(+), 391 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b9e384dc/contrib/storage-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml index 642bc34..d4bfd73 100644 --- a/contrib/storage-hbase/pom.xml +++ b/contrib/storage-hbase/pom.xml @@ -39,9 +39,13 @@ <version>${project.version}</version> <exclusions> <exclusion> - <artifactId>hadoop-client</artifactId> + <artifactId>hadoop-common</artifactId> <groupId>org.apache.hadoop</groupId> </exclusion> + <exclusion> + <artifactId>hadoop-client</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> </exclusions> </dependency> @@ -59,9 +63,13 @@ --> <exclusions> <exclusion> - <artifactId>hadoop-client</artifactId> + <artifactId>hadoop-common</artifactId> <groupId>org.apache.hadoop</groupId> </exclusion> + <exclusion> + <artifactId>hadoop-client</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b9e384dc/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 7d79b57..a0abada 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -67,6 +67,31 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase</artifactId> + </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>de.huxhorn.lilith</groupId> <artifactId>de.huxhorn.lilith.logback.appender.multiplex-classic</artifactId> <version>0.9.44</version> @@ -103,128 +128,6 @@ </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> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase</artifactId> - <version>0.94.22-drill-r1</version> - <exclusions> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api-2.5</artifactId> - </exclusion> - <exclusion> - <artifactId>slf4j-log4j12</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - <exclusion> - <artifactId>slf4j-log4j12</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - <exclusion> - <artifactId>log4j</artifactId> - <groupId>log4j</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> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - </exclusion> - <exclusion> - <artifactId>avro-ipc</artifactId> - <groupId>org.apache.avro</groupId> - </exclusion> - <exclusion> - <artifactId>avro</artifactId> - <groupId>org.apache.avro</groupId> - </exclusion> - <exclusion> - <artifactId>commons-codec</artifactId> - <groupId>commons-codec</groupId> - </exclusion> - <exclusion> - <artifactId>jasper-runtime</artifactId> - <groupId>tomcat</groupId> - </exclusion> - <exclusion> - <artifactId>jackson-core-asl</artifactId> - <groupId>org.codehaus.jackson</groupId> - </exclusion> - <exclusion> - <artifactId>jackson-mapper-asl</artifactId> - <groupId>org.codehaus.jackson</groupId> - </exclusion> - <exclusion> - <artifactId>jasper-compiler</artifactId> - <groupId>tomcat</groupId> - </exclusion> - <exclusion> - <artifactId>jamon-runtime</artifactId> - <groupId>org.jamon</groupId> - </exclusion> - <exclusion> - <artifactId>jaxb-api</artifactId> - <groupId>javax.xml.bind</groupId> - </exclusion> - <exclusion> - <artifactId>zookeeper</artifactId> - <groupId>org.apache.zookeeper</groupId> - </exclusion> - <exclusion> - <artifactId>jsp-2.1</artifactId> - <groupId>org.mortbay.jetty</groupId> - </exclusion> - <exclusion> - <artifactId>jsp-api-2.1</artifactId> - <groupId>org.mortbay.jetty</groupId> - </exclusion> - <exclusion> - <artifactId>stax-api</artifactId> - <groupId>stax</groupId> - </exclusion> - </exclusions> - </dependency> </dependencies> <build> <plugins> @@ -254,78 +157,12 @@ <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> - <artifactId>log4j</artifactId> - <groupId>log4j</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> @@ -336,32 +173,6 @@ <dependency> <groupId>com.mapr.fs</groupId> <artifactId>mapr-hbase</artifactId> - <exclusions> - <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>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b9e384dc/exec/java-exec/pom.xml ---------------------------------------------------------------------- diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml index e15bc77..3232db3 100644 --- a/exec/java-exec/pom.xml +++ b/exec/java-exec/pom.xml @@ -21,16 +21,16 @@ <name>exec/Java Execution Engine</name> <dependencies> -<!-- <dependency> --> -<!-- <groupId>org.ow2.asm</groupId> --> -<!-- <artifactId>asm-util</artifactId> --> -<!-- <version>4.1</version> --> -<!-- </dependency> --> + <!-- <dependency> --> + <!-- <groupId>org.ow2.asm</groupId> --> + <!-- <artifactId>asm-util</artifactId> --> + <!-- <version>4.1</version> --> + <!-- </dependency> --> <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-debug-all</artifactId> <version>4.1</version> -<!-- <scope>test</scope> --> + <!-- <scope>test</scope> --> </dependency> <dependency> <groupId>pentaho</groupId> @@ -44,20 +44,20 @@ <version>${project.version}</version> <scope>test</scope> </dependency> -<!-- <dependency> --> -<!-- <groupId>org.ow2.asm</groupId> --> -<!-- <artifactId>asm-commons</artifactId> --> -<!-- <version>4.1</version> --> -<!-- </dependency> --> + <!-- <dependency> --> + <!-- <groupId>org.ow2.asm</groupId> --> + <!-- <artifactId>asm-commons</artifactId> --> + <!-- <version>4.1</version> --> + <!-- </dependency> --> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-pool2</artifactId> <version>2.1</version> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math</artifactId> - <version>2.2</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math</artifactId> + <version>2.2</version> </dependency> <dependency> <groupId>com.thoughtworks.paranamer</groupId> @@ -96,18 +96,18 @@ <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-multipart</artifactId> <version>2.8</version> - </dependency> + </dependency> <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>2.2.0</version> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + <version>2.2.0</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-transport-native-epoll</artifactId> <classifier>linux-x86_64</classifier> <version>4.0.20.Final</version> - </dependency> + </dependency> <dependency> <groupId>org.glassfish.jersey.ext</groupId> <artifactId>jersey-mvc-freemarker</artifactId> @@ -161,7 +161,7 @@ <dependency> <groupId>com.twitter</groupId> <artifactId>parquet-format</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.1-drill-r1</version> <exclusions> <exclusion> <groupId>org.apache.hadoop</groupId> @@ -258,11 +258,11 @@ <artifactId>drill-common</artifactId> <version>${project.version}</version> </dependency> -<!-- <dependency> --> -<!-- <groupId>org.apache.drill.exec</groupId> --> -<!-- <version>${project.version}</version> --> -<!-- <artifactId>drill-buffers</artifactId> --> -<!-- </dependency> --> + <!-- <dependency> --> + <!-- <groupId>org.apache.drill.exec</groupId> --> + <!-- <version>${project.version}</version> --> + <!-- <artifactId>drill-buffers</artifactId> --> + <!-- </dependency> --> <dependency> <groupId>org.apache.drill</groupId> <artifactId>drill-common</artifactId> @@ -340,6 +340,19 @@ <artifactId>joda-time</artifactId> <version>2.3</version> </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase</artifactId> + </dependency> </dependencies> <profiles> @@ -350,107 +363,19 @@ <name>!alt-hadoop</name> </property> </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <exclusions> - <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-client</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> </profile> <profile> <id>mapr</id> <dependencies> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <exclusions> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-client</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>com.mapr.hadoop</groupId> - <artifactId>maprfs</artifactId> - <version>2.4.1-mapr-4.0.0-SNAPSHOT</version> - <exclusions> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - </exclusions> + <artifactId>maprfs</artifactId> </dependency> <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> <version>20090211</version> </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase</artifactId> - <version>0.94.17-mapr-1405-4.0.0-FCS</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-client</artifactId> - </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> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jsp-2.1</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jsp-api-2.1</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api-2.5</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> </profile> <profile> @@ -473,7 +398,9 @@ </profile> <profile> <id>largeTests</id> - <activation><activeByDefault>false</activeByDefault></activation> + <activation> + <activeByDefault>false</activeByDefault> + </activation> <build> <plugins> <plugin> @@ -689,8 +616,9 @@ <artifactId>maven-surefire-plugin</artifactId> <executions> <execution> - <!-- we override the default test execution to exclude tests that would - take unusually long time to run (> 1 minute) and run such tests in a different profile --> + <!-- we override the default test execution to exclude tests + that would take unusually long time to run (> 1 minute) and run such tests + in a different profile --> <id>default-test</id> <phase>test</phase> <goals> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b9e384dc/exec/jdbc-all/pom.xml ---------------------------------------------------------------------- diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml index d767977..650f78a 100644 --- a/exec/jdbc-all/pom.xml +++ b/exec/jdbc-all/pom.xml @@ -42,6 +42,10 @@ <artifactId>log4j</artifactId> </exclusion> <exclusion> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase</artifactId> + </exclusion> + <exclusion> <artifactId>jersey-container-jetty-servlet</artifactId> <groupId>org.glassfish.jersey.containers</groupId> </exclusion> @@ -50,8 +54,12 @@ <groupId>org.eclipse.jetty</groupId> </exclusion> <exclusion> - <artifactId>hadoop-core</artifactId> <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> </exclusion> <exclusion> <artifactId>jersey-media-multipart</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b9e384dc/exec/jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/exec/jdbc/pom.xml b/exec/jdbc/pom.xml index b9b3feb..bc0e30c 100644 --- a/exec/jdbc/pom.xml +++ b/exec/jdbc/pom.xml @@ -127,11 +127,6 @@ <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <scope>test</scope> </dependency> @@ -143,7 +138,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-core</artifactId> - <version>2.4.1-mapr-4.0.0-SNAPSHOT</version> + <version>2.4.1-mapr-1408-SNAPSHOT</version> <exclusions> <exclusion> <artifactId>commons-logging</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b9e384dc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a3fa64e..4e4e901 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ </repository> <repository> - <!-- Keep until we move back to released optiq versions. --> + <!-- Keep until we move back to released optiq versions. --> <id>mapr-drill-optiq-snapshots</id> <name>MapR Drill Optiq Snapshots</name> <url>http://repository.mapr.com/nexus/content/repositories/drill-optiq/</url> @@ -99,7 +99,7 @@ <enabled>true</enabled> </snapshots> </repository> - + <repository> <id>pentaho</id> @@ -190,30 +190,30 @@ </excludes> </configuration> </plugin> - + <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.12.1</version> - <executions> - <execution> - <id>checkstyle-validation</id> - <phase>validate</phase> - <configuration> - <encoding>UTF-8</encoding> - <failsOnError>true</failsOnError> - <consoleOutput>true</consoleOutput> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <configLocation>src/main/resources/checkstyle-config.xml</configLocation> - <suppressionsLocation>src/main/resources/checkstyle-suppressions.xml</suppressionsLocation> - </configuration> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.12.1</version> + <executions> + <execution> + <id>checkstyle-validation</id> + <phase>validate</phase> + <configuration> + <encoding>UTF-8</encoding> + <failsOnError>true</failsOnError> + <consoleOutput>true</consoleOutput> + <includeTestSourceDirectory>true</includeTestSourceDirectory> + <configLocation>src/main/resources/checkstyle-config.xml</configLocation> + <suppressionsLocation>src/main/resources/checkstyle-suppressions.xml</suppressionsLocation> + </configuration> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> </plugin> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> @@ -346,7 +346,10 @@ <artifactId>maven-surefire-plugin</artifactId> <version>2.17</version> <configuration> - <argLine>-Xms512m -Xmx2g -Ddrill.exec.http.enabled=false -Ddrill.exec.sys.store.provider.local.write=false -XX:MaxPermSize=256M -XX:MaxDirectMemorySize=3072M -XX:+CMSClassUnloadingEnabled</argLine> + <argLine>-Xms512m -Xmx2g -Ddrill.exec.http.enabled=false + -Ddrill.exec.sys.store.provider.local.write=false + -XX:MaxPermSize=256M -XX:MaxDirectMemorySize=3072M + -XX:+CMSClassUnloadingEnabled</argLine> <forkCount>4</forkCount> <reuseForks>true</reuseForks> <additionalClasspathElements> @@ -521,7 +524,8 @@ <profiles> <profile> - <!-- this profile adds/overrides few features of the 'apache-release' profile in the parent pom. --> + <!-- this profile adds/overrides few features of the 'apache-release' + profile in the parent pom. --> <id>apache-release</id> <build> <plugins> @@ -544,7 +548,8 @@ <failOnError>false</failOnError> </configuration> </plugin> - <!-- override the parent assembly execution to customize the assembly descriptor and final name --> + <!-- override the parent assembly execution to customize the assembly + descriptor and final name --> <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> @@ -578,24 +583,107 @@ <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>2.4.1</version> + <exclusions> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-api</artifactId> + </exclusion> + <exclusion> + <artifactId>jets3t</artifactId> + <groupId>net.java.dev.jets3t</groupId> + </exclusion> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>mockito-all</artifactId> + <groupId>org.mockito</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging-api</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</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>core</artifactId> + <groupId>org.eclipse.jdt</groupId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-xc</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-jaxrs</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> <version>2.4.1</version> <exclusions> <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api</artifactId> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api</artifactId> </exclusion> <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api-2.5</artifactId> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> </exclusion> <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> </exclusion> <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-api</artifactId> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-api</artifactId> </exclusion> <exclusion> <artifactId>jets3t</artifactId> @@ -622,8 +710,20 @@ <groupId>commons-logging</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>core</artifactId> @@ -648,6 +748,117 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase</artifactId> + <version>0.94.22-drill-r1</version> + <exclusions> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> + </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</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> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + </exclusion> + <exclusion> + <artifactId>avro-ipc</artifactId> + <groupId>org.apache.avro</groupId> + </exclusion> + <exclusion> + <artifactId>avro</artifactId> + <groupId>org.apache.avro</groupId> + </exclusion> + <exclusion> + <artifactId>commons-codec</artifactId> + <groupId>commons-codec</groupId> + </exclusion> + <exclusion> + <artifactId>jasper-runtime</artifactId> + <groupId>tomcat</groupId> + </exclusion> + <exclusion> + <artifactId>jackson-core-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> + <exclusion> + <artifactId>jasper-compiler</artifactId> + <groupId>tomcat</groupId> + </exclusion> + <exclusion> + <artifactId>jamon-runtime</artifactId> + <groupId>org.jamon</groupId> + </exclusion> + <exclusion> + <artifactId>jaxb-api</artifactId> + <groupId>javax.xml.bind</groupId> + </exclusion> + <exclusion> + <artifactId>zookeeper</artifactId> + <groupId>org.apache.zookeeper</groupId> + </exclusion> + <exclusion> + <artifactId>jsp-2.1</artifactId> + <groupId>org.mortbay.jetty</groupId> + </exclusion> + <exclusion> + <artifactId>jsp-api-2.1</artifactId> + <groupId>org.mortbay.jetty</groupId> + </exclusion> + <exclusion> + <artifactId>stax-api</artifactId> + <groupId>stax</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <version>2.11.0</version> @@ -702,24 +913,111 @@ <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>2.4.1-mapr-1408-SNAPSHOT</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + </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>jets3t</artifactId> + <groupId>net.java.dev.jets3t</groupId> + </exclusion> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>mockito-all</artifactId> + <groupId>org.mockito</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging-api</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>core</artifactId> + <groupId>org.eclipse.jdt</groupId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-xc</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-jaxrs</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> - <version>2.4.1-mapr-4.0.0-SNAPSHOT</version> + <version>2.4.1-mapr-1408-SNAPSHOT</version> <exclusions> <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> </exclusion> <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api-2.5</artifactId> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api</artifactId> </exclusion> <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> </exclusion> <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-api</artifactId> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> </exclusion> <exclusion> <artifactId>jets3t</artifactId> @@ -746,8 +1044,20 @@ <groupId>commons-logging</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>core</artifactId> @@ -778,17 +1088,43 @@ <dependency> <groupId>com.mapr.fs</groupId> <artifactId>libprotodefs</artifactId> - <version>2.4.1-mapr-4.0.0-SNAPSHOT</version> + <version>4.0.1-mapr-SNAPSHOT</version> </dependency> <dependency> <groupId>com.mapr.fs</groupId> <artifactId>mapr-hbase</artifactId> - <version>2.4.1-mapr-4.0.0-SNAPSHOT</version> + <version>2.3.0-mapr-4.0.0-FCS</version> + <exclusions> + <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>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.mapr.hadoop</groupId> <artifactId>maprfs</artifactId> - <version>2.4.1-mapr-4.0.0-SNAPSHOT</version> + <version>4.0.1-mapr-SNAPSHOT</version> </dependency> <dependency> <groupId>xerces</groupId> @@ -809,7 +1145,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>2.4.1-mapr-4.0.0-SNAPSHOT</version> + <version>2.4.1-mapr-1408-SNAPSHOT</version> <scope>test</scope> <exclusions> <exclusion> @@ -827,6 +1163,50 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</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> </dependencies> @@ -834,12 +1214,12 @@ <repositories> <repository> <id>mapr-releases</id> - <url>http://maven.corp.maprtech.com/nexus/content/repositories/public</url> + <url>http://repository.mapr.com/maven/</url> <snapshots> <enabled>true</enabled> </snapshots> <releases> - <enabled>false</enabled> + <enabled>true</enabled> </releases> </repository> </repositories> @@ -870,6 +1250,25 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <version>2.3.0-cdh5.0.3</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </dependencyManagement> <repositories> @@ -905,6 +1304,25 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <version>2.4.0.2.1.3.0-563</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </dependencyManagement> <repositories>
