Repository: spark Updated Branches: refs/heads/branch-1.4 9ef6d743a -> 31e640499
[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 <[email protected]> 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. (cherry picked from commit 6e77105e11ff81bfd84561f4e1121111f686df21) Signed-off-by: Patrick Wendell <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/31e64049 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/31e64049 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/31e64049 Branch: refs/heads/branch-1.4 Commit: 31e640499511c93c83d49ddbb2515aa83c9d264d Parents: 9ef6d74 Author: Iulian Dragos <[email protected]> Authored: Fri May 15 14:57:29 2015 -0700 Committer: Patrick Wendell <[email protected]> Committed: Fri May 15 14:57:56 2015 -0700 ---------------------------------------------------------------------- pom.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/31e64049/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: [email protected] For additional commands, e-mail: [email protected]
