diff options
| author | Jey Kottalam <jey@cs.berkeley.edu> | 2013-08-15 12:10:31 -0700 |
|---|---|---|
| committer | Jey Kottalam <jey@cs.berkeley.edu> | 2013-08-16 13:50:12 -0700 |
| commit | 353fab2440dbf1369df20393e0377de2b327de72 (patch) | |
| tree | c68c5ff891a6cf80e923254dda9bd07bdeea18a2 /core/pom.xml | |
| parent | 8add2d7a59c59e72539da86a58b9c2980843f1e0 (diff) | |
| download | spark-353fab2440dbf1369df20393e0377de2b327de72.tar.gz spark-353fab2440dbf1369df20393e0377de2b327de72.tar.bz2 spark-353fab2440dbf1369df20393e0377de2b327de72.zip | |
Initial changes to make Maven build agnostic of hadoop version
Diffstat (limited to 'core/pom.xml')
| -rw-r--r-- | core/pom.xml | 63 |
1 files changed, 5 insertions, 58 deletions
diff --git a/core/pom.xml b/core/pom.xml index dfadd22d42..680ae94a11 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -33,6 +33,11 @@ <dependencies> <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> @@ -130,7 +135,6 @@ <groupId>com.codahale.metrics</groupId> <artifactId>metrics-json</artifactId> </dependency> - <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> @@ -211,67 +215,10 @@ <profiles> <profile> - <id>hadoop1</id> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>src/main/scala</source> - <source>src/hadoop1/scala</source> - </sources> - </configuration> - </execution> - <execution> - <id>add-scala-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>src/test/scala</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <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> <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> |