You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by lr...@apache.org on 2016/01/11 22:02:08 UTC
[26/50] [abbrv] incubator-toree git commit: Removed Hadoop as an
explicit build dependency
Removed Hadoop as an explicit build dependency
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/bc834e87
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/bc834e87
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/bc834e87
Branch: refs/heads/master
Commit: bc834e873d9668d8060b43bd871bd861368e3a54
Parents: dfffa6c
Author: Gino Bustelo <pa...@us.ibm.com>
Authored: Wed Nov 25 09:43:17 2015 -0600
Committer: Gino Bustelo <pa...@us.ibm.com>
Committed: Wed Nov 25 09:43:17 2015 -0600
----------------------------------------------------------------------
Makefile | 3 +--
project/Common.scala | 30 ++----------------------------
2 files changed, 3 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/bc834e87/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 745610d..b0cafd1 100644
--- a/Makefile
+++ b/Makefile
@@ -19,9 +19,8 @@
VERSION?=0.1.5
IS_SNAPSHOT?=true
APACHE_SPARK_VERSION?=1.5.1
-APACHE_HADOOP_VERSION?=2.3.0
-ENV_OPTS=APACHE_SPARK_VERSION=$(APACHE_SPARK_VERSION) APACHE_HADOOP_VERSION=$(APACHE_HADOOP_VERSION) VERSION=$(VERSION) IS_SNAPSHOT=$(IS_SNAPSHOT)
+ENV_OPTS=APACHE_SPARK_VERSION=$(APACHE_SPARK_VERSION) VERSION=$(VERSION) IS_SNAPSHOT=$(IS_SNAPSHOT)
FULL_VERSION=$(shell echo $(VERSION)`[ "$(IS_SNAPSHOT)" == "true" ] && (echo '-SNAPSHOT')` )
ASSEMBLY_JAR=$(shell echo kernel-assembly-$(FULL_VERSION).jar )
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/bc834e87/project/Common.scala
----------------------------------------------------------------------
diff --git a/project/Common.scala b/project/Common.scala
index f61daaf..cef0d45 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -78,29 +78,6 @@ object Common {
}
}
- lazy val hadoopVersion = {
- val hadoopEnvironmentVariable = "APACHE_HADOOP_VERSION"
- val defaultHadoopVersion = "2.3.0"
-
- val _hadoopVersion = Properties.envOrNone(hadoopEnvironmentVariable)
-
- if (_hadoopVersion.isEmpty) {
- scala.Console.out.println(
- s"""
- |[INFO] Using default Apache Hadoop $defaultHadoopVersion!
- """.stripMargin.trim.replace('\n', ' '))
- defaultHadoopVersion
- } else {
- val version = _hadoopVersion.get
- scala.Console.out.println(
- s"""
- |[INFO] Using Apache Hadoop $version provided from
- |$hadoopEnvironmentVariable!
- """.stripMargin.trim.replace('\n', ' '))
- version
- }
- }
-
val settings: Seq[Def.Setting[_]] = Seq(
organization := buildOrganization,
version := buildVersion,
@@ -165,7 +142,6 @@ object Common {
buildLibraryDependencies ++= Seq( "org.apache.spark" %% "spark-core" % "1.5.1" % "provided" excludeAll( // Apache v2
- ExclusionRule(organization = "org.apache.hadoop"),
// Exclude netty (org.jboss.netty is for 3.2.2.Final only)
ExclusionRule(
@@ -177,10 +153,8 @@ object Common {
"org.apache.spark" %% "spark-sql" % sparkVersion % "provided",
"org.apache.spark" %% "spark-mllib" % sparkVersion % "provided",
"org.apache.spark" %% "spark-graphx" % sparkVersion % "provided",
- "org.apache.spark" %% "spark-repl" % sparkVersion % "provided" excludeAll
- ExclusionRule(organization = "org.apache.hadoop"),
- "org.apache.hadoop" % "hadoop-client" % hadoopVersion % "provided" excludeAll
- ExclusionRule(organization = "javax.servlet"))
+ "org.apache.spark" %% "spark-repl" % sparkVersion % "provided"
+ )
// ==========================================================================
// = REBUILD IVY XML SETTINGS BELOW