diff options
author | Patrick Wendell <pwendell@gmail.com> | 2014-01-08 00:38:31 -0800 |
---|---|---|
committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-08 00:38:31 -0800 |
commit | bc81ce040ded3fe791ecffb15baa408346afc92a (patch) | |
tree | 3330fddcffbca7bd8f42f2fa96ded31cdb0430f9 /pom.xml | |
parent | 3ec21f2eee0a322bcb5cce9678a816b012227a61 (diff) | |
parent | bb6a39a6872fb8e7118c5a402b7b9d67459e9a64 (diff) | |
download | spark-bc81ce040ded3fe791ecffb15baa408346afc92a.tar.gz spark-bc81ce040ded3fe791ecffb15baa408346afc92a.tar.bz2 spark-bc81ce040ded3fe791ecffb15baa408346afc92a.zip |
Merge remote-tracking branch 'apache-github/master' into standalone-driver
Conflicts:
core/src/test/scala/org/apache/spark/deploy/JsonProtocolSuite.scala
pom.xml
Diffstat (limited to 'pom.xml')
-rw-r--r-- | pom.xml | 30 |
1 files changed, 6 insertions, 24 deletions
@@ -87,12 +87,17 @@ <modules> <module>core</module> <module>bagel</module> - <module>examples</module> <module>mllib</module> <module>tools</module> <module>streaming</module> <module>repl</module> <module>assembly</module> + <module>external/twitter</module> + <module>external/kafka</module> + <module>external/flume</module> + <module>external/zeromq</module> + <module>external/mqtt</module> + <module>examples</module> </modules> <properties> @@ -140,17 +145,6 @@ <enabled>false</enabled> </snapshots> </repository> - <repository> - <id>mqtt-repo</id> - <name>MQTT Repository</name> - <url>https://repo.eclipse.org/content/repositories/paho-releases</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> </repositories> <dependencyManagement> @@ -260,20 +254,8 @@ </dependency> <dependency> <groupId>${akka.group}</groupId> - <artifactId>akka-zeromq_${scala.binary.version}</artifactId> - <version>${akka.version}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>${akka.group}</groupId> <artifactId>akka-testkit_${scala.binary.version}</artifactId> <version>${akka.version}</version> - <scope>test</scope> <exclusions> <exclusion> <groupId>org.jboss.netty</groupId> |