aboutsummaryrefslogtreecommitdiff
path: root/network/common
diff options
context:
space:
mode:
authorPatrick Wendell <pwendell@gmail.com>2014-10-30 20:15:36 -0700
committerAaron Davidson <aaron@databricks.com>2014-10-30 20:15:36 -0700
commit0734d09320fe37edd3a02718511cda0bda852478 (patch)
treebf3bb586abd9c186b2a0a63dbd53ee43a00b885f /network/common
parent26d31d15fda3f63707a28d1a1115770ad127cf8f (diff)
downloadspark-0734d09320fe37edd3a02718511cda0bda852478.tar.gz
spark-0734d09320fe37edd3a02718511cda0bda852478.tar.bz2
spark-0734d09320fe37edd3a02718511cda0bda852478.zip
HOTFIX: Clean up build in network module.
This is currently breaking the package build for some people (including me). This patch does some general clean-up which also fixes the current issue. - Uses consistent artifact naming - Adds sbt support for this module - Changes tests to use scalatest (fixes the original issue[1]) One thing to note, it turns out that scalatest when invoked in the Maven build doesn't succesfully detect JUnit Java tests. This is a long standing issue, I noticed it applies to all of our current test suites as well. I've created SPARK-4159 to fix this. [1] The original issue is that we need to allocate extra memory for the tests, happens by default in our scalatest configuration. Author: Patrick Wendell <pwendell@gmail.com> Closes #3025 from pwendell/hotfix and squashes the following commits: faa9053 [Patrick Wendell] HOTFIX: Clean up build in network module.
Diffstat (limited to 'network/common')
-rw-r--r--network/common/pom.xml34
1 files changed, 17 insertions, 17 deletions
diff --git a/network/common/pom.xml b/network/common/pom.xml
index e3b7e32870..a33e44b63d 100644
--- a/network/common/pom.xml
+++ b/network/common/pom.xml
@@ -27,12 +27,12 @@
</parent>
<groupId>org.apache.spark</groupId>
- <artifactId>network</artifactId>
+ <artifactId>spark-network-common_2.10</artifactId>
<packaging>jar</packaging>
- <name>Shuffle Streaming Service</name>
+ <name>Spark Project Common Network Code</name>
<url>http://spark.apache.org/</url>
<properties>
- <sbt.project.name>network</sbt.project.name>
+ <sbt.project.name>network-common</sbt.project.name>
</properties>
<dependencies>
@@ -60,6 +60,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.novocode</groupId>
+ <artifactId>junit-interface</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
@@ -69,25 +74,20 @@
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.scalatest</groupId>
+ <artifactId>scalatest_${scala.binary.version}</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-
<build>
- <outputDirectory>target/java/classes</outputDirectory>
- <testOutputDirectory>target/java/test-classes</testOutputDirectory>
+ <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
+ <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
- <configuration>
- <skipTests>false</skipTests>
- <includes>
- <include>**/Test*.java</include>
- <include>**/*Test.java</include>
- <include>**/*Suite.java</include>
- </includes>
- </configuration>
+ <groupId>org.scalatest</groupId>
+ <artifactId>scalatest-maven-plugin</artifactId>
</plugin>
</plugins>
</build>