aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorTathagata Das <tathagata.das1565@gmail.com>2013-02-07 13:59:31 -0800
committerTathagata Das <tathagata.das1565@gmail.com>2013-02-07 13:59:31 -0800
commit4cc223b4785c9da39c4a35d2adb7339dfa8e47e6 (patch)
tree0aa12b24f0074f3c6522a8ab3c16bf8ac9097061 /examples
parentd55e3aa467ab7d406739255bd8dc3dfc60f3cb16 (diff)
parent9cfa06837998f30e50b160bc7aaaad3b33a23c5e (diff)
downloadspark-4cc223b4785c9da39c4a35d2adb7339dfa8e47e6.tar.gz
spark-4cc223b4785c9da39c4a35d2adb7339dfa8e47e6.tar.bz2
spark-4cc223b4785c9da39c4a35d2adb7339dfa8e47e6.zip
Merge branch 'mesos-master' into streaming
Diffstat (limited to 'examples')
-rw-r--r--examples/pom.xml28
1 files changed, 17 insertions, 11 deletions
diff --git a/examples/pom.xml b/examples/pom.xml
index 3355deb6b7..f43af670c6 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -19,6 +19,11 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.twitter4j</groupId>
+ <artifactId>twitter4j-stream</artifactId>
+ <version>3.0.3</version>
+ </dependency>
<dependency>
<groupId>org.scalatest</groupId>
@@ -45,11 +50,6 @@
<profiles>
<profile>
<id>hadoop1</id>
- <activation>
- <property>
- <name>!hadoopVersion</name>
- </property>
- </activation>
<dependencies>
<dependency>
<groupId>org.spark-project</groupId>
@@ -58,6 +58,12 @@
<classifier>hadoop1</classifier>
</dependency>
<dependency>
+ <groupId>org.spark-project</groupId>
+ <artifactId>spark-streaming</artifactId>
+ <version>${project.version}</version>
+ <classifier>hadoop1</classifier>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<scope>provided</scope>
@@ -77,12 +83,6 @@
</profile>
<profile>
<id>hadoop2</id>
- <activation>
- <property>
- <name>hadoopVersion</name>
- <value>2</value>
- </property>
- </activation>
<dependencies>
<dependency>
<groupId>org.spark-project</groupId>
@@ -91,6 +91,12 @@
<classifier>hadoop2</classifier>
</dependency>
<dependency>
+ <groupId>org.spark-project</groupId>
+ <artifactId>spark-streaming</artifactId>
+ <version>${project.version}</version>
+ <classifier>hadoop2</classifier>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<scope>provided</scope>