Repository: incubator-drill Updated Branches: refs/heads/master 5adadfac5 -> a8b309a79
DRILL-1548: Remove jdbc-all from default build * Allow devs to individually disable maven modules from build * Removed duplicate dependency "pentaho:mondrian-data-foodmart-json" from exec/java-exec/pom.xml * Removed duplicate dependency "com.mapr.hadoop:maprfs" from distribution/pom.xml Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/a8b309a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/a8b309a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/a8b309a7 Branch: refs/heads/master Commit: a8b309a792dae2c85d5fa4d368136cd6e45178ea Parents: 5adadfa Author: Hanifi Gunes <[email protected]> Authored: Tue Nov 4 18:38:31 2014 -0800 Committer: Aditya Kishore <[email protected]> Committed: Wed Nov 5 16:55:52 2014 -0800 ---------------------------------------------------------------------- distribution/pom.xml | 114 ++++++++++++++++++++++++++++---------------- exec/java-exec/pom.xml | 6 --- exec/pom.xml | 31 ++++++++++-- pom.xml | 14 +++++- 4 files changed, 114 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a8b309a7/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 35bec70..c3cb215 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -25,21 +25,12 @@ <dependencies> <dependency> - <groupId>sqlline</groupId> - <artifactId>sqlline</artifactId> - </dependency> - <dependency> <groupId>org.apache.drill</groupId> <artifactId>drill-protocol</artifactId> <version>${project.version}</version> <classifier>rebuffed</classifier> </dependency> <dependency> - <groupId>org.apache.drill.contrib.data</groupId> - <artifactId>tpch-sample-data</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.apache.drill.exec</groupId> <artifactId>drill-java-exec</artifactId> <version>${project.version}</version> @@ -57,21 +48,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.drill.exec</groupId> - <artifactId>drill-jdbc-all</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.drill.contrib.storage-hive</groupId> - <artifactId>drill-storage-hive-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.drill.contrib</groupId> - <artifactId>drill-mongo-storage</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> </dependency> @@ -83,18 +59,6 @@ <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> @@ -146,6 +110,80 @@ </plugins> </build> <profiles> + + <profile> + <id>build-jdbc-all</id> + <activation> + <property> + <name>!skipJdbcAll</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.drill.exec</groupId> + <artifactId>drill-jdbc-all</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </profile> + + <profile> + <id>build-contrib</id> + <activation> + <property> + <name>!skipContrib</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>sqlline</groupId> + <artifactId>sqlline</artifactId> + </dependency> + <dependency> + <groupId>org.apache.drill.contrib.data</groupId> + <artifactId>tpch-sample-data</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.drill.contrib</groupId> + <artifactId>drill-mongo-storage</artifactId> + <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> + </dependency> + </dependencies> + </profile> + + <profile> + <id>build-interpreter</id> + <activation> + <property> + <name>!skipInterpreter</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.drill.exec</groupId> + <artifactId>drill-interpreter</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </profile> + <profile> <id>default-hadoop</id> <activation> @@ -167,10 +205,6 @@ <artifactId>maprfs</artifactId> </dependency> <dependency> - <groupId>com.mapr.hadoop</groupId> - <artifactId>maprfs</artifactId> - </dependency> - <dependency> <groupId>com.mapr.fs</groupId> <artifactId>libprotodefs</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a8b309a7/exec/java-exec/pom.xml ---------------------------------------------------------------------- diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml index e75f572..223a782 100644 --- a/exec/java-exec/pom.xml +++ b/exec/java-exec/pom.xml @@ -33,12 +33,6 @@ <!-- <scope>test</scope> --> </dependency> <dependency> - <groupId>pentaho</groupId> - <artifactId>mondrian-data-foodmart-json</artifactId> - <version>0.3.2</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.drill.contrib.data</groupId> <artifactId>tpch-sample-data</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a8b309a7/exec/pom.xml ---------------------------------------------------------------------- diff --git a/exec/pom.xml b/exec/pom.xml index f27320e..608e467 100644 --- a/exec/pom.xml +++ b/exec/pom.xml @@ -28,12 +28,35 @@ <packaging>pom</packaging> <name>exec/Parent Pom</name> - <dependencies> - </dependencies> + + <profiles> + <profile> + <id>build-jdbc-all</id> + <activation> + <property> + <name>!skipJdbcAll</name> + </property> + </activation> + <modules> + <module>jdbc-all</module> + </modules> + </profile> + <profile> + <id>build-interpreter</id> + <activation> + <property> + <name>!skipInterpreter</name> + </property> + </activation> + <modules> + <module>interpreter</module> + </modules> + </profile> + </profiles> + + <modules> <module>java-exec</module> <module>jdbc</module> - <module>jdbc-all</module> - <module>interpreter</module> </modules> </project> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a8b309a7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index cf57823..17b4490 100644 --- a/pom.xml +++ b/pom.xml @@ -181,6 +181,8 @@ <exclude>**/*.tdd</exclude> <exclude>**/*.project</exclude> <exclude>**/*.checkstyle</exclude> + <exclude>**/.classpath</exclude> + <exclude>**/.settings/**</exclude> <exclude>.*/**</exclude> <exclude>**/*.patch</exclude> <exclude>**/*.pb.cc</exclude> @@ -1367,11 +1369,21 @@ </repository> </repositories> </profile> + <profile> + <id>build-contrib</id> + <activation> + <property> + <name>!skipContrib</name> + </property> + </activation> + <modules> + <module>contrib</module> + </modules> + </profile> </profiles> <modules> <module>protocol</module> <module>common</module> - <module>contrib</module> <module>exec</module> <module>distribution</module> </modules>
