diff options
| author | Andrew Or <andrew@databricks.com> | 2015-05-29 17:19:46 -0700 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2015-05-29 17:19:46 -0700 |
| commit | a4f24123d8857656524c9138c7c067a4b1033a5e (patch) | |
| tree | d5038831ab7dc9eeb31bab9e2f0b7965ab3604a8 /external/flume-sink | |
| parent | 8c9979337f193c72fd2f1a891909283de53777e3 (diff) | |
| download | spark-a4f24123d8857656524c9138c7c067a4b1033a5e.tar.gz spark-a4f24123d8857656524c9138c7c067a4b1033a5e.tar.bz2 spark-a4f24123d8857656524c9138c7c067a4b1033a5e.zip | |
[HOT FIX] [BUILD] Fix maven build failures
This patch fixes a build break in maven caused by #6441.
Note that this patch reverts the changes in flume-sink because
this module does not currently depend on Spark core, but the
tests require it. There is not an easy way to make this work
because mvn test dependencies are not transitive (MNG-1378).
For now, we will leave the one test suite in flume-sink out
until we figure out a better solution. This patch is mainly
intended to unbreak the maven build.
Author: Andrew Or <andrew@databricks.com>
Closes #6511 from andrewor14/fix-build-mvn and squashes the following commits:
3d53643 [Andrew Or] [HOT FIX #6441] Fix maven build failures
Diffstat (limited to 'external/flume-sink')
| -rw-r--r-- | external/flume-sink/pom.xml | 7 | ||||
| -rw-r--r-- | external/flume-sink/src/test/scala/org/apache/spark/streaming/flume/sink/SparkSinkSuite.scala | 5 |
2 files changed, 2 insertions, 10 deletions
diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml index bb2ec96715..1f3e619d97 100644 --- a/external/flume-sink/pom.xml +++ b/external/flume-sink/pom.xml @@ -36,13 +36,6 @@ <dependencies> <dependency> - <groupId>org.apache.spark</groupId> - <artifactId>spark-core_${scala.binary.version}</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> diff --git a/external/flume-sink/src/test/scala/org/apache/spark/streaming/flume/sink/SparkSinkSuite.scala b/external/flume-sink/src/test/scala/org/apache/spark/streaming/flume/sink/SparkSinkSuite.scala index e9fbcb9db6..650b2fbe1c 100644 --- a/external/flume-sink/src/test/scala/org/apache/spark/streaming/flume/sink/SparkSinkSuite.scala +++ b/external/flume-sink/src/test/scala/org/apache/spark/streaming/flume/sink/SparkSinkSuite.scala @@ -31,10 +31,9 @@ import org.apache.flume.Context import org.apache.flume.channel.MemoryChannel import org.apache.flume.event.EventBuilder import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory +import org.scalatest.FunSuite -import org.apache.spark.SparkFunSuite - -class SparkSinkSuite extends SparkFunSuite { +class SparkSinkSuite extends FunSuite { val eventsPerBatch = 1000 val channelCapacity = 5000 |