Skip to content
Snippets Groups Projects
Commit ebdfa6bb authored by Raymond Liu's avatar Raymond Liu
Browse files

Using name yarn-alpha/yarn instead of yarn-2.0/yarn-2.2

parent a47ebf72
No related branches found
No related tags found
No related merge requests found
Showing
with 30 additions and 30 deletions
...@@ -124,21 +124,21 @@ ...@@ -124,21 +124,21 @@
<profiles> <profiles>
<profile> <profile>
<id>hadoop2-yarn</id> <id>yarn-alpha</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-yarn-2.0_${scala.binary.version}</artifactId> <artifactId>spark-yarn-alpha_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
<profile> <profile>
<id>hadoop2.2-yarn</id> <id>yarn</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-yarn-2.2_${scala.binary.version}</artifactId> <artifactId>spark-yarn_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -37,16 +37,16 @@ For Apache Hadoop versions 1.x, Cloudera CDH MRv1, and other Hadoop versions wit ...@@ -37,16 +37,16 @@ For Apache Hadoop versions 1.x, Cloudera CDH MRv1, and other Hadoop versions wit
# Cloudera CDH 4.2.0 with MapReduce v1 # Cloudera CDH 4.2.0 with MapReduce v1
$ mvn -Dhadoop.version=2.0.0-mr1-cdh4.2.0 -DskipTests clean package $ mvn -Dhadoop.version=2.0.0-mr1-cdh4.2.0 -DskipTests clean package
For Apache Hadoop 2.x, 0.23.x, Cloudera CDH MRv2, and other Hadoop versions with YARN, you should enable the "hadoop2-yarn" or "hadoop2.2-yarn" profile and set the "hadoop.version", "yarn.version" property: For Apache Hadoop 2.x, 0.23.x, Cloudera CDH MRv2, and other Hadoop versions with YARN, you should enable the "yarn-alpha" or "yarn" profile and set the "hadoop.version", "yarn.version" property:
# Apache Hadoop 2.0.5-alpha # Apache Hadoop 2.0.5-alpha
$ mvn -Phadoop2-yarn -Dhadoop.version=2.0.5-alpha -Dyarn.version=2.0.5-alpha -DskipTests clean package $ mvn -Pyarn-alpha -Dhadoop.version=2.0.5-alpha -Dyarn.version=2.0.5-alpha -DskipTests clean package
# Cloudera CDH 4.2.0 with MapReduce v2 # Cloudera CDH 4.2.0 with MapReduce v2
$ mvn -Phadoop2-yarn -Dhadoop.version=2.0.0-cdh4.2.0 -Dyarn.version=2.0.0-chd4.2.0 -DskipTests clean package $ mvn -Pyarn-alpha -Dhadoop.version=2.0.0-cdh4.2.0 -Dyarn.version=2.0.0-chd4.2.0 -DskipTests clean package
# Apache Hadoop 2.2.X ( e.g. 2.2.0 as below ) and newer # Apache Hadoop 2.2.X ( e.g. 2.2.0 as below ) and newer
$ mvn -Phadoop2.2-yarn -Dhadoop.version=2.2.0 -Dyarn.version=2.2.0 -DskipTests clean package $ mvn -Pyarn -Dhadoop.version=2.2.0 -Dyarn.version=2.2.0 -DskipTests clean package
## Spark Tests in Maven ## ## Spark Tests in Maven ##
......
...@@ -722,7 +722,7 @@ ...@@ -722,7 +722,7 @@
<profiles> <profiles>
<profile> <profile>
<id>hadoop2-yarn</id> <id>yarn-alpha</id>
<properties> <properties>
<hadoop.major.version>2</hadoop.major.version> <hadoop.major.version>2</hadoop.major.version>
<!-- 0.23.* is same as 2.0.* - except hardened to run production jobs --> <!-- 0.23.* is same as 2.0.* - except hardened to run production jobs -->
...@@ -738,7 +738,7 @@ ...@@ -738,7 +738,7 @@
</profile> </profile>
<profile> <profile>
<id>hadoop2.2-yarn</id> <id>yarn</id>
<properties> <properties>
<hadoop.major.version>2</hadoop.major.version> <hadoop.major.version>2</hadoop.major.version>
<hadoop.version>2.2.0</hadoop.version> <hadoop.version>2.2.0</hadoop.version>
......
...@@ -85,11 +85,11 @@ object SparkBuild extends Build { ...@@ -85,11 +85,11 @@ object SparkBuild extends Build {
} }
// Conditionally include the yarn sub-project // Conditionally include the yarn sub-project
lazy val yarn20 = Project("yarn2-alpha", file("yarn/2.0"), settings = yarn20Settings) dependsOn(core) lazy val yarnAlpha = Project("yarn-alpha", file("yarn/alpha"), settings = yarnAlphaSettings) dependsOn(core)
lazy val yarn22 = Project("yarn2-stable", file("yarn/2.2"), settings = yarn22Settings) dependsOn(core) lazy val yarn = Project("yarn", file("yarn/stable"), settings = yarnSettings) dependsOn(core)
lazy val maybeYarn = if (isYarnEnabled) Seq[ClasspathDependency](if (isNewHadoop) yarn22 else yarn20) else Seq[ClasspathDependency]() lazy val maybeYarn = if (isYarnEnabled) Seq[ClasspathDependency](if (isNewHadoop) yarn else yarnAlpha) else Seq[ClasspathDependency]()
lazy val maybeYarnRef = if (isYarnEnabled) Seq[ProjectReference](if (isNewHadoop) yarn22 else yarn20) else Seq[ProjectReference]() lazy val maybeYarnRef = if (isYarnEnabled) Seq[ProjectReference](if (isNewHadoop) yarn else yarnAlpha) else Seq[ProjectReference]()
// Everything except assembly, tools and examples belong to packageProjects // Everything except assembly, tools and examples belong to packageProjects
lazy val packageProjects = Seq[ProjectReference](core, repl, bagel, streaming, mllib) ++ maybeYarnRef lazy val packageProjects = Seq[ProjectReference](core, repl, bagel, streaming, mllib) ++ maybeYarnRef
...@@ -334,12 +334,12 @@ object SparkBuild extends Build { ...@@ -334,12 +334,12 @@ object SparkBuild extends Build {
) ++ extraYarnSettings ) ++ extraYarnSettings
def yarn20Settings = yarnCommonSettings ++ Seq( def yarnAlphaSettings = yarnCommonSettings ++ Seq(
name := "spark-yarn-2.0" name := "spark-yarn-alpha"
) )
def yarn22Settings = yarnCommonSettings ++ Seq( def yarnSettings = yarnCommonSettings ++ Seq(
name := "spark-yarn-2.2" name := "spark-yarn"
) )
// Conditionally include the YARN dependencies because some tools look at all sub-projects and will complain // Conditionally include the YARN dependencies because some tools look at all sub-projects and will complain
......
...@@ -4,9 +4,9 @@ Hadoop Yarn related codes are organized in separate directories for easy managem ...@@ -4,9 +4,9 @@ Hadoop Yarn related codes are organized in separate directories for easy managem
* common : Common codes that do not depending on specific version of Hadoop. * common : Common codes that do not depending on specific version of Hadoop.
* 2.0 / 2.2 : Codes that involve specific version of Hadoop YARN API. * alpha / stable : Codes that involve specific version of Hadoop YARN API.
2.0 actually represents 0.23 and 2.0 alpha represents 0.23 and 2.0.x
2.2 actually represents 2.2 and later, until the API is break again. stable represents 2.2 and later, until the API is break again.
2.0 / 2.2 will build together with common dir into a single jar alpha / stable will build together with common dir into a single jar
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
</parent> </parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-yarn-2.2_2.10</artifactId> <artifactId>spark-yarn-alpha_2.10</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Spark Project YARN 2.2</name> <name>Spark Project YARN Alpha API</name>
<url>http://spark.incubator.apache.org/</url> <url>http://spark.incubator.apache.org/</url>
<build> <build>
......
...@@ -89,16 +89,16 @@ ...@@ -89,16 +89,16 @@
<profiles> <profiles>
<profile> <profile>
<id>hadoop2-yarn</id> <id>yarn-alpha</id>
<modules> <modules>
<module>2.0</module> <module>alpha</module>
</modules> </modules>
</profile> </profile>
<profile> <profile>
<id>hadoop2.2-yarn</id> <id>yarn</id>
<modules> <modules>
<module>2.2</module> <module>stable</module>
</modules> </modules>
</profile> </profile>
</profiles> </profiles>
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
</parent> </parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-yarn-2.0_2.10</artifactId> <artifactId>spark-yarn_2.10</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Spark Project YARN 2.0</name> <name>Spark Project YARN Stable API</name>
<url>http://spark.incubator.apache.org/</url> <url>http://spark.incubator.apache.org/</url>
<build> <build>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment