You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2015/05/15 23:57:52 UTC

spark git commit: [SPARK-7677] [STREAMING] Add Kafka modules to the 2.11 build.

Repository: spark
Updated Branches:
  refs/heads/master 50da9e891 -> 6e77105e1


[SPARK-7677] [STREAMING] Add Kafka modules to the 2.11 build.

This is somewhat related to [SPARK-6154](https://issues.apache.org/jira/browse/SPARK-6154), though it only touches Kafka, not the jline dependency for thriftserver.

I tested this locally on 2.11 (./run-tests) and everything looked good (I had to disable mima, because `MimaBuild` harcodes 2.10 for the previous version -- that's another PR).

Author: Iulian Dragos <ja...@gmail.com>

Closes #6149 from dragos/issue/spark-2.11-kafka and squashes the following commits:

aa15d99 [Iulian Dragos] Add Kafka modules to the 2.11 build.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6e77105e
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6e77105e
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6e77105e

Branch: refs/heads/master
Commit: 6e77105e11ff81bfd84561f4e1121111f686df21
Parents: 50da9e8
Author: Iulian Dragos <ja...@gmail.com>
Authored: Fri May 15 14:57:29 2015 -0700
Committer: Patrick Wendell <pa...@databricks.com>
Committed: Fri May 15 14:57:33 2015 -0700

----------------------------------------------------------------------
 pom.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/6e77105e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 91d1d84..86aa0a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,8 @@
     <module>examples</module>
     <module>repl</module>
     <module>launcher</module>
+    <module>external/kafka</module>
+    <module>external/kafka-assembly</module>
   </modules>
 
   <properties>
@@ -1757,10 +1759,6 @@
         <jline.version>${scala.version}</jline.version>
         <jline.groupid>org.scala-lang</jline.groupid>
       </properties>
-      <modules>
-        <module>external/kafka</module>
-        <module>external/kafka-assembly</module>
-      </modules>
     </profile>
 
     <profile>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org