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 /pom.xml | |
| 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 'pom.xml')
| -rw-r--r-- | pom.xml | 16 |
1 files changed, 13 insertions, 3 deletions
@@ -252,9 +252,9 @@ <version>3.3.2</version> </dependency> <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.5</version> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.5</version> </dependency> <dependency> <groupId>com.google.code.findbugs</groupId> @@ -1139,5 +1139,15 @@ </dependencies> </profile> + <profile> + <id>hive-thriftserver</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <modules> + <module>sql/hive-thriftserver</module> + </modules> + </profile> + </profiles> </project> |