diff options
author | Sandy Ryza <sandy@cloudera.com> | 2014-12-09 11:02:43 -0800 |
---|---|---|
committer | Andrew Or <andrew@databricks.com> | 2014-12-09 11:02:43 -0800 |
commit | 912563aa3553afc0871d5b5858f533aa39cb99e5 (patch) | |
tree | 092241ac4c78deef8053f5095bc9680b3c8532cd /yarn/pom.xml | |
parent | 383c5555c9f26c080bc9e3a463aab21dd5b3797f (diff) | |
download | spark-912563aa3553afc0871d5b5858f533aa39cb99e5.tar.gz spark-912563aa3553afc0871d5b5858f533aa39cb99e5.tar.bz2 spark-912563aa3553afc0871d5b5858f533aa39cb99e5.zip |
SPARK-4338. [YARN] Ditch yarn-alpha.
Sorry if this is a little premature with 1.2 still not out the door, but it will make other work like SPARK-4136 and SPARK-2089 a lot easier.
Author: Sandy Ryza <sandy@cloudera.com>
Closes #3215 from sryza/sandy-spark-4338 and squashes the following commits:
1c5ac08 [Sandy Ryza] Update building Spark docs and remove unnecessary newline
9c1421c [Sandy Ryza] SPARK-4338. Ditch yarn-alpha.
Diffstat (limited to 'yarn/pom.xml')
-rw-r--r-- | yarn/pom.xml | 129 |
1 files changed, 55 insertions, 74 deletions
diff --git a/yarn/pom.xml b/yarn/pom.xml index bba73648c7..d7579bf962 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -25,9 +25,9 @@ </parent> <groupId>org.apache.spark</groupId> - <artifactId>yarn-parent_2.10</artifactId> - <packaging>pom</packaging> - <name>Spark Project YARN Parent POM</name> + <artifactId>spark-yarn_2.10</artifactId> + <packaging>jar</packaging> + <name>Spark Project YARN</name> <properties> <sbt.project.name>yarn</sbt.project.name> </properties> @@ -59,6 +59,12 @@ <artifactId>hadoop-client</artifactId> </dependency> <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-server-tests</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.binary.version}</artifactId> <scope>test</scope> @@ -70,41 +76,54 @@ </dependency> </dependencies> + <!-- + See SPARK-3710. hadoop-yarn-server-tests in Hadoop 2.2 fails to pull some needed + dependencies, so they need to be added manually for the tests to work. + --> <profiles> <profile> - <id>yarn-alpha</id> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <echo>*******************************************************************************************</echo> - <echo>***WARNING***: Support for YARN-alpha API's will be removed in Spark 1.3 (see SPARK-3445).*</echo> - <echo>*******************************************************************************************</echo> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <modules> - <module>alpha</module> - </modules> - </profile> - - <profile> - <id>yarn</id> - <modules> - <module>stable</module> - </modules> + <id>hadoop-2.2</id> + <properties> + <jersey.version>1.9</jersey.version> + </properties> + <dependencies> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>6.1.26</version> + <exclusions> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + <version>${jersey.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-json</artifactId> + <version>${jersey.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-server</artifactId> + <version>${jersey.version}</version> + <scope>test</scope> + </dependency> + </dependencies> </profile> </profiles> @@ -125,38 +144,6 @@ </configuration> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-scala-sources</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>src/main/scala</source> - <source>../common/src/main/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> - <source>../common/src/test/scala</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.scalatest</groupId> <artifactId>scalatest-maven-plugin</artifactId> <configuration> @@ -169,12 +156,6 @@ <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory> - - <resources> - <resource> - <directory>../common/src/main/resources</directory> - </resource> - </resources> </build> </project> |