Repository: spark Updated Branches: refs/heads/master 82197ed3b -> 5aecdcf1f
SPARK-5669 [BUILD] [HOTFIX] Spark assembly includes incompatibly licensed libgfortran, libgcc code via JBLAS Correct exclusion path for JBLAS native libs. (More explanation coming soon on the mailing list re: 1.3.0 RC1) Author: Sean Owen <so...@cloudera.com> Closes #4673 from srowen/SPARK-5669.2 and squashes the following commits: e29693c [Sean Owen] Correct exclusion path for JBLAS native libs Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/5aecdcf1 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/5aecdcf1 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/5aecdcf1 Branch: refs/heads/master Commit: 5aecdcf1f23a826f6236096001de1dd811dbc443 Parents: 82197ed Author: Sean Owen <so...@cloudera.com> Authored: Wed Feb 18 14:41:44 2015 +0000 Committer: Sean Owen <so...@cloudera.com> Committed: Wed Feb 18 14:41:44 2015 +0000 ---------------------------------------------------------------------- assembly/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/5aecdcf1/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index fbb6e94..3d1ed0d 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -119,9 +119,9 @@ <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> + <exclude>lib/static/Linux/i386/**</exclude> + <exclude>lib/static/Mac OS X/**</exclude> + <exclude>lib/static/Windows/**</exclude> </excludes> </filter> </filters> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org