From e7690ed20a2734b7ca88e78a60a8e75ba19e9d8b Mon Sep 17 00:00:00 2001
From: Adam Pingel <adam@axle-lang.org>
Date: Mon, 17 Nov 2014 10:47:29 -0800
Subject: [PATCH] SPARK-2811 upgrade algebird to 0.8.1
Author: Adam Pingel <adam@axle-lang.org>
Closes #3282 from adampingel/master and squashes the following commits:
70c8d3c [Adam Pingel] relocate the algebird example back to example/src
7a9d8be [Adam Pingel] SPARK-2811 upgrade algebird to 0.8.1
---
examples/pom.xml | 14 +++++++-------
.../examples/streaming/TwitterAlgebirdCMS.scala | 0
.../examples/streaming/TwitterAlgebirdHLL.scala | 0
3 files changed, 7 insertions(+), 7 deletions(-)
rename examples/{scala-2.10 => }/src/main/scala/org/apache/spark/examples/streaming/TwitterAlgebirdCMS.scala (100%)
rename examples/{scala-2.10 => }/src/main/scala/org/apache/spark/examples/streaming/TwitterAlgebirdHLL.scala (100%)
diff --git a/examples/pom.xml b/examples/pom.xml
index 2752ce3ca9..85e133779e 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -217,6 +217,11 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.twitter</groupId>
+ <artifactId>algebird-core_${scala.binary.version}</artifactId>
+ <version>0.8.1</version>
+ </dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
@@ -389,8 +394,8 @@
</properties>
</profile>
<profile>
- <!-- We add a source directory specific to Scala 2.10 since Kafka and Algebird
- only work with it -->
+ <!-- We add a source directory specific to Scala 2.10 since Kafka
+ only works with it -->
<id>scala-2.10</id>
<activation>
<property><name>!scala-2.11</name></property>
@@ -401,11 +406,6 @@
<artifactId>spark-streaming-kafka_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.twitter</groupId>
- <artifactId>algebird-core_${scala.binary.version}</artifactId>
- <version>0.1.11</version>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/examples/scala-2.10/src/main/scala/org/apache/spark/examples/streaming/TwitterAlgebirdCMS.scala b/examples/src/main/scala/org/apache/spark/examples/streaming/TwitterAlgebirdCMS.scala
similarity index 100%
rename from examples/scala-2.10/src/main/scala/org/apache/spark/examples/streaming/TwitterAlgebirdCMS.scala
rename to examples/src/main/scala/org/apache/spark/examples/streaming/TwitterAlgebirdCMS.scala
diff --git a/examples/scala-2.10/src/main/scala/org/apache/spark/examples/streaming/TwitterAlgebirdHLL.scala b/examples/src/main/scala/org/apache/spark/examples/streaming/TwitterAlgebirdHLL.scala
similarity index 100%
rename from examples/scala-2.10/src/main/scala/org/apache/spark/examples/streaming/TwitterAlgebirdHLL.scala
rename to examples/src/main/scala/org/apache/spark/examples/streaming/TwitterAlgebirdHLL.scala
--
GitLab