diff options
| author | Cheng Lian <lian.cs.zju@gmail.com> | 2014-07-28 12:07:30 -0700 |
|---|---|---|
| committer | Michael Armbrust <michael@databricks.com> | 2014-07-28 12:07:30 -0700 |
| commit | a7a9d14479ea6421513a962ff0f45cb969368bab (patch) | |
| tree | 76c4ec208e31cabea38e6e2ec6deaa7667dbf46a /yarn | |
| parent | 255b56f9f530e8594a7e6055ae07690454c66799 (diff) | |
| download | spark-a7a9d14479ea6421513a962ff0f45cb969368bab.tar.gz spark-a7a9d14479ea6421513a962ff0f45cb969368bab.tar.bz2 spark-a7a9d14479ea6421513a962ff0f45cb969368bab.zip | |
[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 'yarn')
| -rw-r--r-- | yarn/alpha/pom.xml | 2 | ||||
| -rw-r--r-- | yarn/pom.xml | 2 | ||||
| -rw-r--r-- | yarn/stable/pom.xml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/yarn/alpha/pom.xml b/yarn/alpha/pom.xml index 5b13a1f002..51744ece04 100644 --- a/yarn/alpha/pom.xml +++ b/yarn/alpha/pom.xml @@ -24,7 +24,7 @@ <relativePath>../pom.xml</relativePath> </parent> <properties> - <sbt.project.name>yarn-alpha</sbt.project.name> + <sbt.project.name>yarn-alpha</sbt.project.name> </properties> <groupId>org.apache.spark</groupId> diff --git a/yarn/pom.xml b/yarn/pom.xml index efb473aa1b..3faaf05363 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -29,7 +29,7 @@ <packaging>pom</packaging> <name>Spark Project YARN Parent POM</name> <properties> - <sbt.project.name>yarn</sbt.project.name> + <sbt.project.name>yarn</sbt.project.name> </properties> <dependencies> diff --git a/yarn/stable/pom.xml b/yarn/stable/pom.xml index ceaf9f9d71..b6c8456d06 100644 --- a/yarn/stable/pom.xml +++ b/yarn/stable/pom.xml @@ -24,7 +24,7 @@ <relativePath>../pom.xml</relativePath> </parent> <properties> - <sbt.project.name>yarn-stable</sbt.project.name> + <sbt.project.name>yarn-stable</sbt.project.name> </properties> <groupId>org.apache.spark</groupId> |