more cleanup

Author: cfregly

dev/audit-release/sbt_app_core/src/main/scala/SparkApp.scala

@@ -47,14 +47,14 @@ object SimpleApp {
       System.exit(-1)
     }
     if (foundGanglia) {
-      println("Ganglia sink was loaded via spark-core")
+      println("Ganglia sink was loaded via spark-ganglia-lgpl")
       System.exit(-1)
     }
 
     // Remove kinesis from default build due to ASL license issue
     val foundKinesis = Try(Class.forName("org.apache.spark.streaming.kinesis.KinesisReceiver")).isSuccess
     if (foundKinesis) {
-      println("Kinesis was loaded via spark-core")
+      println("Kinesis was loaded via spark-kinesis-asl")
       System.exit(-1)
     }
   }

extras/spark-kinesis-asl/pom.xml

@@ -24,14 +24,18 @@
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
-  <!-- Kinesis integration is not included by default due to ASL-licensed code -->
+  <!-- 
+    Kinesis integration is not included by default due to ASL-licensed code.
+    Note:  This project - if activated - is packaged with the main Spark assembly.
+           This only needs to packaged as a separate jar when running the examples.
+  -->
   <groupId>org.apache.spark</groupId>
   <artifactId>spark-kinesis-asl_2.10</artifactId>
   <packaging>jar</packaging>
   <name>Spark Kinesis Integration</name>
 
   <properties>
-    <sbt.project.name>spark-kinesis-asl</sbt.project.name>
+    <sbt.project.name>kinesis-asl</sbt.project.name>
   </properties>
 
   <dependencies>

project/SparkBuild.scala

@@ -36,7 +36,7 @@ object BuildCommons {
       "streaming-zeromq").map(ProjectRef(buildLocation, _))
 
   val optionallyEnabledProjects@Seq(yarn, yarnStable, yarnAlpha, java8Tests, sparkGangliaLgpl, sparkKinesisAsl) =
-    Seq("yarn", "yarn-stable", "yarn-alpha", "java8-tests", "ganglia-lgpl", "spark-kinesis-asl")
+    Seq("yarn", "yarn-stable", "yarn-alpha", "java8-tests", "ganglia-lgpl", "kinesis-asl")
       .map(ProjectRef(buildLocation, _))
 
   val assemblyProjects@Seq(assembly, examples) = Seq("assembly", "examples")
@@ -60,7 +60,7 @@ object SparkBuild extends PomBuild {
     var isAlphaYarn = false
     var profiles: mutable.Seq[String] = mutable.Seq.empty
     if (Properties.envOrNone("SPARK_GANGLIA_LGPL").isDefined) {
-      println("NOTE: SPARK_GANGLIA_LGPL is deprecated, please use -Pganglia-lgpl flag.")
+      println("NOTE: SPARK_GANGLIA_LGPL is deprecated, please use -Pspark-ganglia-lgpl flag.")
       profiles ++= Seq("spark-ganglia-lgpl")
     }
     if (Properties.envOrNone("SPARK_KINESIS_ASL").isDefined) {