diff options
Diffstat (limited to 'project')
| -rw-r--r-- | project/MimaBuild.scala | 10 | ||||
| -rw-r--r-- | project/SparkBuild.scala | 8 |
2 files changed, 13 insertions, 5 deletions
diff --git a/project/MimaBuild.scala b/project/MimaBuild.scala index 3dc1ceacde..2a989dd4f7 100644 --- a/project/MimaBuild.scala +++ b/project/MimaBuild.scala @@ -89,7 +89,15 @@ object MimaBuild { def mimaSettings(sparkHome: File, projectRef: ProjectRef) = { val organization = "org.apache.spark" val previousSparkVersion = "1.6.0" - val fullId = "spark-" + projectRef.project + "_2.11" + // This check can be removed post-2.0 + val project = if (previousSparkVersion == "1.6.0" && + projectRef.project == "streaming-kafka-0-8" + ) { + "streaming-kafka" + } else { + projectRef.project + } + val fullId = "spark-" + project + "_2.11" mimaDefaultSettings ++ Seq(previousArtifact := Some(organization % fullId % previousSparkVersion), binaryIssueFilters ++= ignoredABIProblems(sparkHome, version.value)) diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index f50f41a88d..d83afa03f5 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -46,7 +46,7 @@ object BuildCommons { val streamingProjects@Seq( streaming, streamingFlumeSink, streamingFlume, streamingKafka ) = Seq( - "streaming", "streaming-flume-sink", "streaming-flume", "streaming-kafka" + "streaming", "streaming-flume-sink", "streaming-flume", "streaming-kafka-0-8" ).map(ProjectRef(buildLocation, _)) val allProjects@Seq( @@ -62,7 +62,7 @@ object BuildCommons { "docker-integration-tests").map(ProjectRef(buildLocation, _)) val assemblyProjects@Seq(networkYarn, streamingFlumeAssembly, streamingKafkaAssembly, streamingKinesisAslAssembly) = - Seq("network-yarn", "streaming-flume-assembly", "streaming-kafka-assembly", "streaming-kinesis-asl-assembly") + Seq("network-yarn", "streaming-flume-assembly", "streaming-kafka-0-8-assembly", "streaming-kinesis-asl-assembly") .map(ProjectRef(buildLocation, _)) val copyJarsProjects@Seq(assembly, examples) = Seq("assembly", "examples") @@ -581,8 +581,8 @@ object Assembly { .getOrElse(SbtPomKeys.effectivePom.value.getProperties.get("hadoop.version").asInstanceOf[String]) }, jarName in assembly <<= (version, moduleName, hadoopVersion) map { (v, mName, hv) => - if (mName.contains("streaming-flume-assembly") || mName.contains("streaming-kafka-assembly") || mName.contains("streaming-kinesis-asl-assembly")) { - // This must match the same name used in maven (see external/kafka-assembly/pom.xml) + if (mName.contains("streaming-flume-assembly") || mName.contains("streaming-kafka-0-8-assembly") || mName.contains("streaming-kinesis-asl-assembly")) { + // This must match the same name used in maven (see external/kafka-0-8-assembly/pom.xml) s"${mName}-${v}.jar" } else { s"${mName}-${v}-hadoop${hv}.jar" |