diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2014-07-10 11:03:37 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-07-10 11:03:37 -0700 |
| commit | 628932b8d0dbbc6c68c61d4bca1c504f38684c2a (patch) | |
| tree | b388e5d9bf73fee4fa8d2a4ddd125688d7f65250 /pom.xml | |
| parent | c2babc089bd97137d240ca119ec4fc4b5a1422c8 (diff) | |
| download | spark-628932b8d0dbbc6c68c61d4bca1c504f38684c2a.tar.gz spark-628932b8d0dbbc6c68c61d4bca1c504f38684c2a.tar.bz2 spark-628932b8d0dbbc6c68c61d4bca1c504f38684c2a.zip | |
[SPARK-1776] Have Spark's SBT build read dependencies from Maven.
Patch introduces the new way of working also retaining the existing ways of doing things.
For example build instruction for yarn in maven is
`mvn -Pyarn -PHadoop2.2 clean package -DskipTests`
in sbt it can become
`MAVEN_PROFILES="yarn, hadoop-2.2" sbt/sbt clean assembly`
Also supports
`sbt/sbt -Pyarn -Phadoop-2.2 -Dhadoop.version=2.2.0 clean assembly`
Author: Prashant Sharma <prashant.s@imaginea.com>
Author: Patrick Wendell <pwendell@gmail.com>
Closes #772 from ScrapCodes/sbt-maven and squashes the following commits:
a8ac951 [Prashant Sharma] Updated sbt version.
62b09bb [Prashant Sharma] Improvements.
fa6221d [Prashant Sharma] Excluding sql from mima
4b8875e [Prashant Sharma] Sbt assembly no longer builds tools by default.
72651ca [Prashant Sharma] Addresses code reivew comments.
acab73d [Prashant Sharma] Revert "Small fix to run-examples script."
ac4312c [Prashant Sharma] Revert "minor fix"
6af91ac [Prashant Sharma] Ported oldDeps back. + fixes issues with prev commit.
65cf06c [Prashant Sharma] Servelet API jars mess up with the other servlet jars on the class path.
446768e [Prashant Sharma] minor fix
89b9777 [Prashant Sharma] Merge conflicts
d0a02f2 [Prashant Sharma] Bumped up pom versions, Since the build now depends on pom it is better updated there. + general cleanups.
dccc8ac [Prashant Sharma] updated mima to check against 1.0
a49c61b [Prashant Sharma] Fix for tools jar
a2f5ae1 [Prashant Sharma] Fixes a bug in dependencies.
cf88758 [Prashant Sharma] cleanup
9439ea3 [Prashant Sharma] Small fix to run-examples script.
96cea1f [Prashant Sharma] SPARK-1776 Have Spark's SBT build read dependencies from Maven.
36efa62 [Patrick Wendell] Set project name in pom files and added eclipse/intellij plugins.
4973dbd [Patrick Wendell] Example build using pom reader.
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -110,7 +110,7 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>1.6</java.version> - + <sbt.project.name>spark</sbt.project.name> <scala.version>2.10.4</scala.version> <scala.binary.version>2.10</scala.binary.version> <mesos.version>0.18.1</mesos.version> @@ -536,6 +536,10 @@ <artifactId>servlet-api-2.5</artifactId> </exclusion> <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> <groupId>junit</groupId> <artifactId>junit</artifactId> </exclusion> @@ -619,6 +623,10 @@ <version>${yarn.version}</version> <exclusions> <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> <groupId>asm</groupId> <artifactId>asm</artifactId> </exclusion> |