toree-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chipsenkb...@apache.org
Subject incubator-toree git commit: [TOREE-355] Enable Toree to run on Hadoop distributions
Date Mon, 27 Mar 2017 14:36:43 GMT
Repository: incubator-toree
Updated Branches:
  refs/heads/master 092b90f40 -> 14c80857a


[TOREE-355] Enable Toree to run on Hadoop distributions

Shade some dependencies around ASM and Clapper ClassUtil
that causes conflicts in Hadoop distributions that have
older versions of these dependencies.

Closes #115


Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/14c80857
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/14c80857
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/14c80857

Branch: refs/heads/master
Commit: 14c80857a5f2a816cf0405624a32210018e85d53
Parents: 092b90f
Author: Luciano Resende <lresende@apache.org>
Authored: Thu Mar 16 11:16:58 2017 -0700
Committer: Chip Senkbeil <rcsenkbe@us.ibm.com>
Committed: Mon Mar 27 09:36:19 2017 -0500

----------------------------------------------------------------------
 build.sbt | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/14c80857/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index 7943cc1..43d1a09 100644
--- a/build.sbt
+++ b/build.sbt
@@ -230,6 +230,11 @@ scalacOptions in (ScalaUnidoc, unidoc) ++= Seq(
 libraryDependencies ++= Dependencies.sparkAll.value
 unmanagedResourceDirectories in Compile += { baseDirectory.value / "dist/toree-legal" }
 
+assemblyShadeRules in assembly := Seq(
+  ShadeRule.rename("org.clapper.classutil.**" -> "shadeclapper.@0").inAll,
+  ShadeRule.rename("org.objectweb.asm.**" -> "shadeasm.@0").inAll
+)
+
 test in assembly := {}
 assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false)
 aggregate in assembly := false


Mime
View raw message