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:44:45 UTC
git commit: MRUNIT-176: Branch trunk-hadoop1 should use hadoop 1
Updated Branches:
refs/heads/trunk-hadoop1 3891031d1 -> 35676de4f
MRUNIT-176: Branch trunk-hadoop1 should use hadoop 1
Project: http://git-wip-us.apache.org/repos/asf/mrunit/repo
Commit: http://git-wip-us.apache.org/repos/asf/mrunit/commit/35676de4
Tree: http://git-wip-us.apache.org/repos/asf/mrunit/tree/35676de4
Diff: http://git-wip-us.apache.org/repos/asf/mrunit/diff/35676de4
Branch: refs/heads/trunk-hadoop1
Commit: 35676de4fdc921d950bdb6b14c9860f221bf6ab7
Parents: 3891031
Author: Brock Noland <br...@apache.org>
Authored: Wed Feb 6 16:44:14 2013 -0600
Committer: Brock Noland <br...@apache.org>
Committed: Wed Feb 6 16:44:14 2013 -0600
----------------------------------------------------------------------
pom.xml | 63 ++++++++++-----------------------------------------------
1 files changed, 11 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mrunit/blob/35676de4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d9d46e5..566c731 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,10 @@
<artifactId>mrunit</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ <properties>
+ <envClassifier>hadoop1</envClassifier>
+ </properties>
+
<name>MRUnit</name>
<url>http://mrunit.apache.org</url>
@@ -262,58 +266,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 +343,12 @@
<artifactId>mockito-all</artifactId>
<version>1.8.5</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>1.0.3</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>