diff options
| author | Adam Pingel <adam@axle-lang.org> | 2014-11-17 10:47:29 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-11-17 10:47:46 -0800 |
| commit | e0ab1c4766e1af384213a853588f6e69acd3b780 (patch) | |
| tree | ae40a3e6e23bea261c2f2fad42fc49896b4df10b /examples | |
| parent | d9d36a53dfeb51e4e070803e26187d436fd1f747 (diff) | |
| download | spark-e0ab1c4766e1af384213a853588f6e69acd3b780.tar.gz spark-e0ab1c4766e1af384213a853588f6e69acd3b780.tar.bz2 spark-e0ab1c4766e1af384213a853588f6e69acd3b780.zip | |
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
(cherry picked from commit e7690ed20a2734b7ca88e78a60a8e75ba19e9d8b)
Signed-off-by: Patrick Wendell <pwendell@gmail.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/pom.xml | 14 | ||||
| -rw-r--r-- | examples/src/main/scala/org/apache/spark/examples/streaming/TwitterAlgebirdCMS.scala (renamed from examples/scala-2.10/src/main/scala/org/apache/spark/examples/streaming/TwitterAlgebirdCMS.scala) | 0 | ||||
| -rw-r--r-- | examples/src/main/scala/org/apache/spark/examples/streaming/TwitterAlgebirdHLL.scala (renamed from examples/scala-2.10/src/main/scala/org/apache/spark/examples/streaming/TwitterAlgebirdHLL.scala) | 0 |
3 files changed, 7 insertions, 7 deletions
diff --git a/examples/pom.xml b/examples/pom.xml index 5bbc9bd85f..4955bd14c7 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -218,6 +218,11 @@ <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> <scope>test</scope> @@ -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 index 683752ac96..683752ac96 100644 --- 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 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 index 62db5e663b..62db5e663b 100644 --- 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 |