diff options
| author | Steve Loughran <stevel@hortonworks.com> | 2015-04-01 16:26:54 +0100 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2015-04-01 16:26:54 +0100 |
| commit | ee11be258251adf900680927ba200bf46512cc04 (patch) | |
| tree | 80c1ce4eea558679dc22bd27f926ee7c215af3de /sql/hive/pom.xml | |
| parent | d36c5fca7b9227c4c6e1b0c1455269b5fd8d4852 (diff) | |
| download | spark-ee11be258251adf900680927ba200bf46512cc04.tar.gz spark-ee11be258251adf900680927ba200bf46512cc04.tar.bz2 spark-ee11be258251adf900680927ba200bf46512cc04.zip | |
SPARK-6433 hive tests to import spark-sql test JAR for QueryTest access
1. Test JARs are built & published
1. log4j.resources is explicitly excluded. Without this, downstream test run logging depends on the order the JARs are listed/loaded
1. sql/hive pulls in spark-sql &...spark-catalyst for its test runs
1. The copied in test classes were rm'd, and a test edited to remove its now duplicate assert method
1. Spark streaming is now build with the same plugin/phase as the rest, but its shade plugin declaration is kept in (so different from the rest of the test plugins). Due to (#2), this means the test JAR no longer includes its log4j file.
Outstanding issues:
* should the JARs be shaded? `spark-streaming-test.jar` does, but given these are test jars for developers only, especially in the same spark source tree, it's hard to justify.
* `maven-jar-plugin` v 2.6 was explicitly selected; without this the apache-1.4 parent template JAR version (2.4) chosen.
* Are there any other resources to exclude?
Author: Steve Loughran <stevel@hortonworks.com>
Closes #5119 from steveloughran/stevel/patches/SPARK-6433-test-jars and squashes the following commits:
81ceb01 [Steve Loughran] SPARK-6433 add a clearer comment explaining what the plugin is doing & why
a6dca33 [Steve Loughran] SPARK-6433 : pull configuration section form archive plugin
c2b5f89 [Steve Loughran] SPARK-6433 omit "jar" goal from jar plugin
fdac51b [Steve Loughran] SPARK-6433 -002; indentation & delegate plugin version to parent
650f442 [Steve Loughran] SPARK-6433 patch 001: test JARs are built; sql/hive pulls in spark-sql & spark-catalyst for its test runs
Diffstat (limited to 'sql/hive/pom.xml')
| -rw-r--r-- | sql/hive/pom.xml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index a9816f6c38..04440076a2 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -89,6 +89,20 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-sql_${scala.binary.version}</artifactId> + <type>test-jar</type> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-catalyst_${scala.binary.version}</artifactId> + <type>test-jar</type> + <version>${project.version}</version> + <scope>test</scope> + </dependency> </dependencies> <profiles> <profile> |