Repository: spark Updated Branches: refs/heads/master 61eb12674 -> 836577b38
SPARK-5669 [BUILD] Spark assembly includes incompatibly licensed libgfortran, libgcc code via JBLAS Exclude libgfortran, libgcc bundled by JBLAS for Windows. This much is simple, and solves the essential license issue. But the more important question is whether MLlib works on Windows then. Author: Sean Owen <so...@cloudera.com> Closes #4453 from srowen/SPARK-5669 and squashes the following commits: 734dd86 [Sean Owen] Exclude libgfortran, libgcc bundled by JBLAS, affecting Windows / OS X / Linux 32-bit (not Linux 64-bit) Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/836577b3 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/836577b3 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/836577b3 Branch: refs/heads/master Commit: 836577b382695558f5c97d94ee725d0156ebfad2 Parents: 61eb126 Author: Sean Owen <so...@cloudera.com> Authored: Sun Feb 15 09:15:48 2015 -0800 Committer: Xiangrui Meng <m...@databricks.com> Committed: Sun Feb 15 09:15:48 2015 -0800 ---------------------------------------------------------------------- assembly/pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/836577b3/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index fa9f56e..fbb6e94 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -114,6 +114,16 @@ <exclude>META-INF/*.RSA</exclude> </excludes> </filter> + <filter> + <!-- Exclude libgfortran, libgcc for license issues --> + <artifact>org.jblas:jblas</artifact> + <excludes> + <!-- Linux amd64 is OK; not statically linked --> + <exclude>lib/Linux/i386/**</exclude> + <exclude>lib/Mac OS X/**</exclude> + <exclude>lib/Windows/**</exclude> + </excludes> + </filter> </filters> </configuration> <executions> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
