aboutsummaryrefslogtreecommitdiff
path: root/external/flume
diff options
context:
space:
mode:
authorSean Owen <sowen@cloudera.com>2014-08-25 13:29:07 -0700
committerTathagata Das <tathagata.das1565@gmail.com>2014-08-25 13:29:07 -0700
commitcd30db566a327ddf63cd242c758e46ce2d9479df (patch)
tree7a5591f4b464b6d2670d5eaf4dbd815c16a01ccd /external/flume
parent220f413686ae922bd11776576bf37610cce92c23 (diff)
downloadspark-cd30db566a327ddf63cd242c758e46ce2d9479df.tar.gz
spark-cd30db566a327ddf63cd242c758e46ce2d9479df.tar.bz2
spark-cd30db566a327ddf63cd242c758e46ce2d9479df.zip
SPARK-2798 [BUILD] Correct several small errors in Flume module pom.xml files
(EDIT) Since the scalatest issue was since resolved, this is now about a few small problems in the Flume Sink `pom.xml` - `scalatest` is not declared as a test-scope dependency - Its Avro version doesn't match the rest of the build - Its Flume version is not synced with the other Flume module - The other Flume module declares its dependency on Flume Sink slightly incorrectly, hard-coding the Scala 2.10 version - It depends on Scala Lang directly, which it shouldn't Author: Sean Owen <sowen@cloudera.com> Closes #1726 from srowen/SPARK-2798 and squashes the following commits: a46e2c6 [Sean Owen] scalatest to test scope, harmonize Avro and Flume versions, remove direct Scala dependency, fix '2.10' in Flume dependency
Diffstat (limited to 'external/flume')
-rw-r--r--external/flume/pom.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/external/flume/pom.xml b/external/flume/pom.xml
index c532705f39..f71f6b6c4f 100644
--- a/external/flume/pom.xml
+++ b/external/flume/pom.xml
@@ -42,6 +42,11 @@
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
+ <artifactId>spark-streaming-flume-sink_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
<artifactId>spark-streaming_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
@@ -50,7 +55,7 @@
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-sdk</artifactId>
- <version>1.4.0</version>
+ <version>${flume.version}</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
@@ -82,11 +87,6 @@
<artifactId>junit-interface</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-streaming-flume-sink_2.10</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
<build>
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>