diff options
author | Josh Rosen <joshrosen@apache.org> | 2014-09-02 10:45:14 -0700 |
---|---|---|
committer | Andrew Or <andrewor14@gmail.com> | 2014-09-02 10:45:14 -0700 |
commit | 378b2315b474e9a94d034f3955eca7cb0a59cba0 (patch) | |
tree | 78a7ab350f28aaf6a1bf06dbaa56fa16a2a1d851 /core/pom.xml | |
parent | 32ec0a8cd4020f1e8ef2997de310823b566ab2de (diff) | |
download | spark-378b2315b474e9a94d034f3955eca7cb0a59cba0.tar.gz spark-378b2315b474e9a94d034f3955eca7cb0a59cba0.tar.bz2 spark-378b2315b474e9a94d034f3955eca7cb0a59cba0.zip |
[SPARK-3061] Fix Maven build under Windows
The Maven build was failing on Windows because it tried to call the unix `unzip` utility to extract the Py4J files into core's build directory. I've fixed this issue by using the `maven-antrun-plugin` to perform the unzipping.
I also fixed an issue that prevented tests from running under Windows:
In the Maven ScalaTest plugin, the filename listed in <filereports> is placed under the <reportsDirectory>; the current code places it in a subdirectory of reportsDirectory, e.g.
```
${project.build.directory}/surefire-reports/${project.build.directory}/SparkTestSuite.txt
```
This caused problems under Windows because it would try to create a subdirectory named "c:\\".
Note that the tests still fail under Windows (for other reasons); this PR just allows them to run and fail rather than crash when trying to create the test reports directory.
Author: Josh Rosen <joshrosen@apache.org>
Author: Josh Rosen <rosenville@gmail.com>
Author: Josh Rosen <joshrosen@databricks.com>
Closes #2165 from JoshRosen/windows-support and squashes the following commits:
651d210 [Josh Rosen] Unzip to python/build instead of core/build
fbf3e61 [Josh Rosen] 4 spaces -> 2 spaces
e347668 [Josh Rosen] Fix Maven scalatest filereports path:
4994af1 [Josh Rosen] [SPARK-3061] Use maven-antrun-plugin to unzip Py4J.
Diffstat (limited to 'core/pom.xml')
-rw-r--r-- | core/pom.xml | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/core/pom.xml b/core/pom.xml index 83c708dfc9..55bfe0b841 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -306,26 +306,20 @@ </plugin> <!-- Unzip py4j so we can include its files in the jar --> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> <phase>generate-resources</phase> <goals> - <goal>exec</goal> + <goal>run</goal> </goals> </execution> </executions> <configuration> - <executable>unzip</executable> - <workingDirectory>../python</workingDirectory> - <arguments> - <argument>-o</argument> - <argument>lib/py4j*.zip</argument> - <argument>-d</argument> - <argument>build</argument> - </arguments> + <tasks> + <unzip src="../python/lib/py4j-0.8.2.1-src.zip" dest="../python/build" /> + </tasks> </configuration> </plugin> <plugin> |