Updated Branches: refs/heads/master a455ee706 -> 5d6feb28d
Fixes for compiling cdh4-mr1. Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/5d6feb28 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/5d6feb28 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/5d6feb28 Branch: refs/heads/master Commit: 5d6feb28dc45c2640df8ed5181ea2903b2163a50 Parents: a455ee7 Author: Aaron McCurry <[email protected]> Authored: Sun Jul 21 21:05:32 2013 -0400 Committer: Aaron McCurry <[email protected]> Committed: Sun Jul 21 21:05:32 2013 -0400 ---------------------------------------------------------------------- blur-core/pom.xml | 12 ++++++------ blur-mapred/pom.xml | 36 ++++++++++++++++++++++++++++++------ pom.xml | 2 +- 3 files changed, 37 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5d6feb28/blur-core/pom.xml ---------------------------------------------------------------------- diff --git a/blur-core/pom.xml b/blur-core/pom.xml index 40137b6..6b695b8 100644 --- a/blur-core/pom.xml +++ b/blur-core/pom.xml @@ -157,25 +157,25 @@ under the License. <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> + <artifactId>hadoop-client</artifactId> <version>${hadoop.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> + <artifactId>hadoop-core</artifactId> <version>${hadoop.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> + <artifactId>hadoop-test</artifactId> <version>${hadoop.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> + <artifactId>hadoop-minicluster</artifactId> <version>${hadoop.version}</version> + <scope>test</scope> </dependency> </dependencies> </profile> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5d6feb28/blur-mapred/pom.xml ---------------------------------------------------------------------- diff --git a/blur-mapred/pom.xml b/blur-mapred/pom.xml index d8187cd..7e49870 100644 --- a/blur-mapred/pom.xml +++ b/blur-mapred/pom.xml @@ -77,12 +77,6 @@ under the License. </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.mrunit</groupId> - <artifactId>mrunit</artifactId> - <version>${mrunit.version}</version> - <scope>test</scope> - </dependency> </dependencies> <repositories> @@ -130,17 +124,47 @@ under the License. <version>${hadoop.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.mrunit</groupId> + <artifactId>mrunit</artifactId> + <version>${mrunit.version}</version> + <classifier>hadoop1</classifier> + <scope>test</scope> + </dependency> </dependencies> </profile> <profile> <id>cdh4-mr1</id> <dependencies> <dependency> + <groupId>org.apache.mrunit</groupId> + <artifactId>mrunit</artifactId> + <version>${mrunit.version}</version> + <classifier>hadoop1</classifier> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-test</artifactId> <version>${hadoop.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <version>${hadoop.version}</version> + <scope>test</scope> + </dependency> </dependencies> </profile> </profiles> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5d6feb28/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index efb24b7..a0873b2 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ under the License. <metrics-graphite.version>2.2.0</metrics-graphite.version> <mockito.version>1.9.0</mockito.version> <json.version>20090211</json.version> - <mrunit.version>0.8.0-incubating</mrunit.version> + <mrunit.version>0.9.0-incubating</mrunit.version> <httpclient.version>4.1.3</httpclient.version> </properties>
