aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorCheng Lian <lian.cs.zju@gmail.com>2014-07-28 12:07:30 -0700
committerMichael Armbrust <michael@databricks.com>2014-07-28 12:07:30 -0700
commita7a9d14479ea6421513a962ff0f45cb969368bab (patch)
tree76c4ec208e31cabea38e6e2ec6deaa7667dbf46a /tools
parent255b56f9f530e8594a7e6055ae07690454c66799 (diff)
[SPARK-2410][SQL] Merging Hive Thrift/JDBC server (with Maven profile fix)
JIRA issue: [SPARK-2410](https://issues.apache.org/jira/browse/SPARK-2410) Another try for #1399 & #1600. Those two PR breaks Jenkins builds because we made a separate profile `hive-thriftserver` in sub-project `assembly`, but the `hive-thriftserver` module is defined outside the `hive-thriftserver` profile. Thus every time a pull request that doesn't touch SQL code will also execute test suites defined in `hive-thriftserver`, but tests fail because related .class files are not included in the assembly jar. In the most recent commit, module `hive-thriftserver` is moved into its own profile to fix this problem. All previous commits are squashed for clarity. Author: Cheng Lian <lian.cs.zju@gmail.com> Closes #1620 from liancheng/jdbc-with-maven-fix and squashes the following commits: 629988e [Cheng Lian] Moved hive-thriftserver module definition into its own profile ec3c7a7 [Cheng Lian] Cherry picked the Hive Thrift server
Diffstat (limited to 'tools')
-rw-r--r--tools/pom.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/pom.xml b/tools/pom.xml
index c0ee8faa7a..97abb6b2b6 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.apache.spark</groupId>
<artifactId>spark-tools_2.10</artifactId>
<properties>
- <sbt.project.name>tools</sbt.project.name>
+ <sbt.project.name>tools</sbt.project.name>
</properties>
<packaging>jar</packaging>
<name>Spark Project Tools</name>