You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mrql.apache.org by fe...@apache.org on 2013/10/29 15:23:34 UTC
git commit: MRQL-23: Add support for Yarn
Updated Branches:
refs/heads/master b02961352 -> 2f7bbacd8
MRQL-23: Add support for Yarn
Project: http://git-wip-us.apache.org/repos/asf/incubator-mrql/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mrql/commit/2f7bbacd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mrql/tree/2f7bbacd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mrql/diff/2f7bbacd
Branch: refs/heads/master
Commit: 2f7bbacd81a7d843a0491a4808638c8aa9cbf5dc
Parents: b029613
Author: fegaras <fe...@cse.uta.edu>
Authored: Tue Oct 29 09:22:56 2013 -0500
Committer: fegaras <fe...@cse.uta.edu>
Committed: Tue Oct 29 09:22:56 2013 -0500
----------------------------------------------------------------------
pom.xml | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 45 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/2f7bbacd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 82629cb..4757784 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<properties>
<hadoop.version>1.0.3</hadoop.version>
- <hama.version>0.6.2</hama.version>
+ <hama.version>0.6.3</hama.version>
<spark.version>0.8.0-incubating</spark.version>
</properties>
@@ -65,11 +65,6 @@
<version>11a</version>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
@@ -178,6 +173,50 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>hadoop1</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>hadoop1</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>yarn</id>
+ <activation>
+ <property>
+ <name>yarn</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-mrql.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-mrql.git</developerConnection>