You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mrunit.apache.org by br...@apache.org on 2013/02/06 23:41:03 UTC
git commit: MRUNIT-172: Branch trunk should use hadoop 2
Updated Branches:
refs/heads/trunk 5bc108643 -> 0c6460834
MRUNIT-172: Branch trunk should use hadoop 2
Project: http://git-wip-us.apache.org/repos/asf/mrunit/repo
Commit: http://git-wip-us.apache.org/repos/asf/mrunit/commit/0c646083
Tree: http://git-wip-us.apache.org/repos/asf/mrunit/tree/0c646083
Diff: http://git-wip-us.apache.org/repos/asf/mrunit/diff/0c646083
Branch: refs/heads/trunk
Commit: 0c6460834bb7925ecffeddf97828a732dbd1d5ff
Parents: 5bc1086
Author: Brock Noland <br...@apache.org>
Authored: Wed Feb 6 16:40:43 2013 -0600
Committer: Brock Noland <br...@apache.org>
Committed: Wed Feb 6 16:40:43 2013 -0600
----------------------------------------------------------------------
pom.xml | 71 +++++++++++++++------------------------------------------
1 files changed, 19 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mrunit/blob/0c646083/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d9d46e5..2704757 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,11 @@
<artifactId>mrunit</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ <properties>
+ <envClassifier>hadoop2</envClassifier>
+ <specificHadoopVersion>2.0.0-alpha</specificHadoopVersion>
+ </properties>
+
<name>MRUnit</name>
<url>http://mrunit.apache.org</url>
@@ -262,58 +267,6 @@
<profiles>
<profile>
- <id>hadoop1</id>
- <activation>
- <property>
- <name>!hadoop.version</name>
- </property>
- </activation>
- <properties>
- <envClassifier>hadoop1</envClassifier>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>1.0.3</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>hadoop2</id>
- <activation>
- <property>
- <name>hadoop.version</name>
- <value>2</value>
- </property>
- </activation>
-
- <properties>
- <envClassifier>hadoop2</envClassifier>
- <specificHadoopVersion>2.0.0-alpha</specificHadoopVersion>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${specificHadoopVersion}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- <version>${specificHadoopVersion}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
<id>sign</id>
<build>
<plugins>
@@ -391,5 +344,19 @@
<artifactId>mockito-all</artifactId>
<version>1.8.5</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${specificHadoopVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <version>${specificHadoopVersion}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>