Skip to content

Commit

Permalink
Update to MRUnit 0.8.1-incubating which supports Hadoop 1 and 2 APIs.
Browse files Browse the repository at this point in the history
  • Loading branch information
@tomwhite
tomwhite committed Apr 17, 2012
1 parent e5dfe80 commit 454e1e9
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 50 deletions.
12 changes: 0 additions & 12 deletions book/pom.xml
View file
Expand Up @@ -147,18 +147,6 @@
<version>1.4</version> <version>1.4</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.mrunit</groupId>
<artifactId>mrunit</artifactId>
<version>0.8.0-incubating</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId> <artifactId>commons-exec</artifactId>
Expand Down
4 changes: 0 additions & 4 deletions ch05/pom.xml
View file
Expand Up @@ -21,9 +21,5 @@
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId> <artifactId>hamcrest-all</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.mrunit</groupId>
<artifactId>mrunit</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>
76 changes: 42 additions & 34 deletions hadoop-meta/pom.xml
View file
Expand Up @@ -54,6 +54,13 @@ A module which allows the Hadoop dependencies to be specified by a Maven profile
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.mrunit</groupId>
<artifactId>mrunit</artifactId>
<version>0.8.1-incubating</version>
<classifier>hadoop020</classifier>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
Expand Down Expand Up @@ -116,6 +123,13 @@ A module which allows the Hadoop dependencies to be specified by a Maven profile
<artifactId>jackson-mapper-asl</artifactId> <artifactId>jackson-mapper-asl</artifactId>
<version>1.5.2</version> <version>1.5.2</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.mrunit</groupId>
<artifactId>mrunit</artifactId>
<version>0.8.1-incubating</version>
<classifier>hadoop100</classifier>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
Expand Down Expand Up @@ -173,6 +187,13 @@ A module which allows the Hadoop dependencies to be specified by a Maven profile
<artifactId>jackson-core-asl</artifactId> <artifactId>jackson-core-asl</artifactId>
<version>1.7.3</version> <!-- To match that in Avro --> <version>1.7.3</version> <!-- To match that in Avro -->
</dependency> </dependency>
<dependency>
<groupId>org.apache.mrunit</groupId>
<artifactId>mrunit</artifactId>
<version>0.8.1-incubating</version>
<classifier>hadoop100</classifier>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
Expand Down Expand Up @@ -238,6 +259,13 @@ A module which allows the Hadoop dependencies to be specified by a Maven profile
<version>${hadoop.version}</version> <version>${hadoop.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.mrunit</groupId>
<artifactId>mrunit</artifactId>
<version>0.8.1-incubating</version>
<classifier>hadoop023</classifier>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
Expand All @@ -255,16 +283,6 @@ A module which allows the Hadoop dependencies to be specified by a Maven profile
</testExcludes> </testExcludes>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<!-- Exclude ch5 tests until MRUnit works with 0.22+ -->
<exclude>v*/*.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
Expand Down Expand Up @@ -321,21 +339,14 @@ A module which allows the Hadoop dependencies to be specified by a Maven profile
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.mrunit</groupId>
<artifactId>mrunit</artifactId>
<version>0.8.1-incubating</version>
<classifier>hadoop023</classifier>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<!-- Exclude ch5 tests until MRUnit works with 0.22+ -->
<exclude>v*/*.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</profile> </profile>
<profile> <profile>
<id>apache-trunk</id> <id>apache-trunk</id>
Expand Down Expand Up @@ -390,6 +401,13 @@ A module which allows the Hadoop dependencies to be specified by a Maven profile
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.mrunit</groupId>
<artifactId>mrunit</artifactId>
<version>0.8.1-incubating</version>
<classifier>hadoop023</classifier>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
Expand All @@ -402,16 +420,6 @@ A module which allows the Hadoop dependencies to be specified by a Maven profile
</testExcludes> </testExcludes>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<!-- Exclude ch5 tests until MRUnit works with 0.22+ -->
<exclude>v*/*.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
Expand Down

0 comments on commit 454e1e9

Please sign in to comment.