Skip to content

Commit 8df37e4

Browse files
SPARK-1729. Make Flume pull data from source, rather than the current push model
Updated Maven build to be equivalent of the sbt build.
1 parent 03d6c1c commit 8df37e4

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

external/flume-sink/pom.xml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<version>1.4.0</version>
3737
<exclusions>
3838
<exclusion>
39-
<groupId>org.jboss.netty</groupId>
39+
<groupId>io.netty</groupId>
4040
<artifactId>netty</artifactId>
4141
</exclusion>
4242
<exclusion>
@@ -49,6 +49,16 @@
4949
<groupId>org.apache.flume</groupId>
5050
<artifactId>flume-ng-core</artifactId>
5151
<version>1.4.0</version>
52+
<exclusions>
53+
<exclusion>
54+
<groupId>io.netty</groupId>
55+
<artifactId>netty</artifactId>
56+
</exclusion>
57+
<exclusion>
58+
<groupId>org.apache.thrift</groupId>
59+
<artifactId>libthrift</artifactId>
60+
</exclusion>
61+
</exclusions>
5262
</dependency>
5363
</dependencies>
5464
<build>
@@ -64,7 +74,6 @@
6474
<artifactId>avro-maven-plugin</artifactId>
6575
<version>1.7.3</version>
6676
<configuration>
67-
<stringType>String</stringType>
6877
<!-- Generate the output in the same directory as the sbt-avro-plugin -->
6978
<outputDirectory>${project.basedir}/target/scala-${scala.binary.version}/src_managed/main/compiled_avro</outputDirectory>
7079
</configuration>

project/plugins.sbt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ resolvers += Resolver.url("artifactory", url("http://scalasbt.artifactoryonline.
44

55
resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/"
66

7-
resolvers += "sbt-plugins" at "http://repo.scala-sbt.org/scalasbt/sbt-plugin-releases"
8-
97
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.10.2")
108

119
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")

0 commit comments

Comments
 (0)