Repository: spark Updated Branches: refs/heads/branch-1.3 3997e74f6 -> 9f256ce84
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 (cherry picked from commit 5aecdcf1f23a826f6236096001de1dd811dbc443) Signed-off-by: Sean Owen <so...@cloudera.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9f256ce8 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9f256ce8 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9f256ce8 Branch: refs/heads/branch-1.3 Commit: 9f256ce84bbfb1348bc9a70a90e04810388dbe0e Parents: 3997e74 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:56 2015 +0000 ---------------------------------------------------------------------- assembly/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/9f256ce8/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index 7752b41..8a92c8f 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -123,9 +123,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
