aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorgatorsmile <gatorsmile@gmail.com>2017-09-29 11:45:58 -0700
committergatorsmile <gatorsmile@gmail.com>2017-09-29 11:45:58 -0700
commit472864014c42da08b9d3f3fffbe657c6fcf1e2ef (patch)
treec23d75f412441477bcd0bbd07a3a24f8d1fcbe1d /project
parent9ed7394a68315126b2dd00e53a444cc65b5a62ea (diff)
Revert "[SPARK-22142][BUILD][STREAMING] Move Flume support behind a profile"
This reverts commit a2516f41aef68e39df7f6380fd2618cc148a609e.
Diffstat (limited to 'project')
-rw-r--r--project/SparkBuild.scala17
1 files changed, 8 insertions, 9 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 9501eed1e9..a568d264cb 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -43,8 +43,11 @@ object BuildCommons {
"catalyst", "sql", "hive", "hive-thriftserver", "sql-kafka-0-10"
).map(ProjectRef(buildLocation, _))
- val streamingProjects@Seq(streaming, streamingKafka010) =
- Seq("streaming", "streaming-kafka-0-10").map(ProjectRef(buildLocation, _))
+ val streamingProjects@Seq(
+ streaming, streamingFlumeSink, streamingFlume, streamingKafka010
+ ) = Seq(
+ "streaming", "streaming-flume-sink", "streaming-flume", "streaming-kafka-0-10"
+ ).map(ProjectRef(buildLocation, _))
val allProjects@Seq(
core, graphx, mllib, mllibLocal, repl, networkCommon, networkShuffle, launcher, unsafe, tags, sketch, kvstore, _*
@@ -53,13 +56,9 @@ object BuildCommons {
"tags", "sketch", "kvstore"
).map(ProjectRef(buildLocation, _)) ++ sqlProjects ++ streamingProjects
- val optionallyEnabledProjects@Seq(mesos, yarn,
- streamingFlumeSink, streamingFlume,
- streamingKafka, sparkGangliaLgpl, streamingKinesisAsl,
- dockerIntegrationTests, hadoopCloud) =
- Seq("mesos", "yarn",
- "streaming-flume-sink", "streaming-flume",
- "streaming-kafka-0-8", "ganglia-lgpl", "streaming-kinesis-asl",
+ val optionallyEnabledProjects@Seq(mesos, yarn, streamingKafka, sparkGangliaLgpl,
+ streamingKinesisAsl, dockerIntegrationTests, hadoopCloud) =
+ Seq("mesos", "yarn", "streaming-kafka-0-8", "ganglia-lgpl", "streaming-kinesis-asl",
"docker-integration-tests", "hadoop-cloud").map(ProjectRef(buildLocation, _))
val assemblyProjects@Seq(networkYarn, streamingFlumeAssembly, streamingKafkaAssembly, streamingKafka010Assembly, streamingKinesisAslAssembly) =