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 /streaming/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 'streaming/pom.xml')
-rw-r--r-- | streaming/pom.xml | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/streaming/pom.xml b/streaming/pom.xml index 23a8358d45..5ca55a4f68 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -97,34 +97,6 @@ <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory> <plugins> - <!-- - This plugin forces the generation of jar containing streaming test classes, - so that the tests classes of external modules can use them. The two execution profiles - are necessary - first one for 'mvn package', second one for 'mvn test-compile'. Ideally, - 'mvn compile' should not compile test classes and therefore should not need this. - However, an open Maven bug (http://jira.codehaus.org/browse/MNG-3559) - causes the compilation to fail if streaming test-jar is not generated. Hence, the - second execution profile for 'mvn test-compile'. - --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - <execution> - <id>test-jar-on-test-compile</id> - <phase>test-compile</phase> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> |