diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2013-04-22 14:13:56 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2013-04-22 14:14:03 +0530 |
| commit | 185bb9525a3a48313cd5e446e1b80d2d697465d8 (patch) | |
| tree | bdbab31c488d6140973ef99d93cc8ff959cad50f /core/pom.xml | |
| parent | 4b57f83209b94f87890ef307af45fa493e7fdba8 (diff) | |
| parent | 17e076de800ea0d4c55f2bd657348641f6f9c55b (diff) | |
| download | spark-185bb9525a3a48313cd5e446e1b80d2d697465d8.tar.gz spark-185bb9525a3a48313cd5e446e1b80d2d697465d8.tar.bz2 spark-185bb9525a3a48313cd5e446e1b80d2d697465d8.zip | |
Manually merged scala-2.10 and master
Diffstat (limited to 'core/pom.xml')
| -rw-r--r-- | core/pom.xml | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/core/pom.xml b/core/pom.xml index 6316b28a7b..7f5cffc818 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,8 +3,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.spark-project</groupId> - <artifactId>parent</artifactId> - <version>0.7.0-SNAPSHOT</version> + <artifactId>spark-parent</artifactId> + <version>0.8.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -91,6 +91,10 @@ <groupId>org.apache.mesos</groupId> <artifactId>mesos</artifactId> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> <dependency> <groupId>org.scalatest</groupId> @@ -103,6 +107,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.novocode</groupId> <artifactId>junit-interface</artifactId> <scope>test</scope> @@ -167,11 +176,6 @@ <profiles> <profile> <id>hadoop1</id> - <activation> - <property> - <name>!hadoopVersion</name> - </property> - </activation> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> @@ -224,12 +228,6 @@ </profile> <profile> <id>hadoop2</id> - <activation> - <property> - <name>hadoopVersion</name> - <value>2</value> - </property> - </activation> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> |