aboutsummaryrefslogtreecommitdiff
path: root/mllib/pom.xml
diff options
context:
space:
mode:
authorJey Kottalam <jey@cs.berkeley.edu>2013-08-15 12:10:31 -0700
committerJey Kottalam <jey@cs.berkeley.edu>2013-08-16 13:50:12 -0700
commit353fab2440dbf1369df20393e0377de2b327de72 (patch)
treec68c5ff891a6cf80e923254dda9bd07bdeea18a2 /mllib/pom.xml
parent8add2d7a59c59e72539da86a58b9c2980843f1e0 (diff)
downloadspark-353fab2440dbf1369df20393e0377de2b327de72.tar.gz
spark-353fab2440dbf1369df20393e0377de2b327de72.tar.bz2
spark-353fab2440dbf1369df20393e0377de2b327de72.zip
Initial changes to make Maven build agnostic of hadoop version
Diffstat (limited to 'mllib/pom.xml')
-rw-r--r--mllib/pom.xml43
1 files changed, 10 insertions, 33 deletions
diff --git a/mllib/pom.xml b/mllib/pom.xml
index a07480fbe2..36f410d3b0 100644
--- a/mllib/pom.xml
+++ b/mllib/pom.xml
@@ -33,6 +33,16 @@
<dependencies>
<dependency>
+ <groupId>org.spark-project</groupId>
+ <artifactId>spark-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</dependency>
@@ -41,7 +51,6 @@
<artifactId>jblas</artifactId>
<version>1.2.3</version>
</dependency>
-
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.version}</artifactId>
@@ -71,33 +80,6 @@
<profiles>
<profile>
- <id>hadoop1</id>
- <dependencies>
- <dependency>
- <groupId>org.spark-project</groupId>
- <artifactId>spark-core</artifactId>
- <version>${project.version}</version>
- <classifier>hadoop1</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <classifier>hadoop1</classifier>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>hadoop2</id>
<dependencies>
<dependency>
@@ -108,11 +90,6 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<scope>provided</scope>
</dependency>