aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorSean Owen <sowen@cloudera.com>2017-10-06 15:08:28 +0100
committerSean Owen <sowen@cloudera.com>2017-10-06 15:08:28 +0100
commit0c03297bf0e87944f9fe0535fdae5518228e3e29 (patch)
treee6bff6e618297ba486d5d46fc09c8c5fbf27cc2d /project
parent83488cc3180ca18f829516f550766efb3095881e (diff)
[SPARK-22142][BUILD][STREAMING] Move Flume support behind a profile, take 2
## What changes were proposed in this pull request? Move flume behind a profile, take 2. See https://github.com/apache/spark/pull/19365 for most of the back-story. This change should fix the problem by removing the examples module dependency and moving Flume examples to the module itself. It also adds deprecation messages, per a discussion on dev about deprecating for 2.3.0. ## How was this patch tested? Existing tests, which still enable flume integration. Author: Sean Owen <sowen@cloudera.com> Closes #19412 from srowen/SPARK-22142.2.
Diffstat (limited to 'project')
-rw-r--r--project/SparkBuild.scala17
1 files changed, 9 insertions, 8 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index a568d264cb..9501eed1e9 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -43,11 +43,8 @@ object BuildCommons {
"catalyst", "sql", "hive", "hive-thriftserver", "sql-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 streamingProjects@Seq(streaming, streamingKafka010) =
+ Seq("streaming", "streaming-kafka-0-10").map(ProjectRef(buildLocation, _))
val allProjects@Seq(
core, graphx, mllib, mllibLocal, repl, networkCommon, networkShuffle, launcher, unsafe, tags, sketch, kvstore, _*
@@ -56,9 +53,13 @@ object BuildCommons {
"tags", "sketch", "kvstore"
).map(ProjectRef(buildLocation, _)) ++ sqlProjects ++ streamingProjects
- val optionallyEnabledProjects@Seq(mesos, yarn, streamingKafka, sparkGangliaLgpl,
- streamingKinesisAsl, dockerIntegrationTests, hadoopCloud) =
- Seq("mesos", "yarn", "streaming-kafka-0-8", "ganglia-lgpl", "streaming-kinesis-asl",
+ 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",
"docker-integration-tests", "hadoop-cloud").map(ProjectRef(buildLocation, _))
val assemblyProjects@Seq(networkYarn, streamingFlumeAssembly, streamingKafkaAssembly, streamingKafka010Assembly, streamingKinesisAslAssembly) =