Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/MockAsm.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/MockAsm.java?rev=1213978&r1=1213977&r2=1213978&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/MockAsm.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/MockAsm.java Tue Dec 13 23:12:33 2011 @@ -284,6 +284,11 @@ public abstract class MockAsm extends Mo public FinalApplicationStatus getFinalApplicationStatus() { return FinalApplicationStatus.UNDEFINED; } + + @Override + public RMAppAttempt getCurrentAppAttempt() { + return null; + } }; }
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/pom.xml?rev=1213978&r1=1213977&r2=1213978&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/pom.xml (original) +++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/pom.xml Tue Dec 13 23:12:33 2011 @@ -169,7 +169,7 @@ <dependency> <groupId>com.google.inject.extensions</groupId> <artifactId>guice-servlet</artifactId> - <version>2.0</version> + <version>3.0</version> </dependency> <dependency> <groupId>junit</groupId> @@ -290,9 +290,30 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-servlet</artifactId> - <version>2.0</version> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>com.sun.jersey.jersey-test-framework</groupId> + <artifactId>jersey-test-framework-core</artifactId> + <version>1.8</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.jersey.jersey-test-framework</groupId> + <artifactId>jersey-test-framework-grizzly2</artifactId> + <version>1.8</version> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-server</artifactId> + <version>1.8</version> + </dependency> + <dependency> + <groupId>com.sun.jersey.contribs</groupId> + <artifactId>jersey-guice</artifactId> + <version>1.8</version> </dependency> <dependency> <groupId>org.jboss.netty</groupId> Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/pom.xml?rev=1213978&r1=1213977&r2=1213978&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/pom.xml (original) +++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/pom.xml Tue Dec 13 23:12:33 2011 @@ -143,9 +143,24 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-server</artifactId> + <version>1.8</version> + </dependency> + <dependency> + <groupId>com.sun.jersey.contribs</groupId> + <artifactId>jersey-guice</artifactId> + <version>1.8</version> + </dependency> + <dependency> <groupId>com.google.inject.extensions</groupId> <artifactId>guice-servlet</artifactId> - <version>2.0</version> + <version>3.0</version> </dependency> <dependency> <groupId>junit</groupId>
