IGNITE-1195 Fixed hadoop build.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bde1d1db Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bde1d1db Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bde1d1db Branch: refs/heads/ignite-1282 Commit: bde1d1db3592f74e9e46ca6af57b55adc8b96c1f Parents: e9f22ab Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Fri Nov 27 12:18:16 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Fri Nov 27 12:18:16 2015 +0300 ---------------------------------------------------------------------- modules/yarn/pom.xml | 6 +++--- .../ignite/yarn/IgniteApplicationMasterSelfTest.java | 11 +++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/bde1d1db/modules/yarn/pom.xml ---------------------------------------------------------------------- diff --git a/modules/yarn/pom.xml b/modules/yarn/pom.xml index 2b758dc..d1f6390 100644 --- a/modules/yarn/pom.xml +++ b/modules/yarn/pom.xml @@ -35,20 +35,20 @@ <url>http://ignite.apache.org</url> <properties> - <hadoop.version>2.7.0</hadoop.version> + <hadoop-yarn.version>2.7.0</hadoop-yarn.version> </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-client</artifactId> - <version>${hadoop.version}</version> + <version>${hadoop-yarn.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> + <version>${hadoop-yarn.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/bde1d1db/modules/yarn/src/test/java/org/apache/ignite/yarn/IgniteApplicationMasterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/yarn/src/test/java/org/apache/ignite/yarn/IgniteApplicationMasterSelfTest.java b/modules/yarn/src/test/java/org/apache/ignite/yarn/IgniteApplicationMasterSelfTest.java index 2173701..97f6a12 100644 --- a/modules/yarn/src/test/java/org/apache/ignite/yarn/IgniteApplicationMasterSelfTest.java +++ b/modules/yarn/src/test/java/org/apache/ignite/yarn/IgniteApplicationMasterSelfTest.java @@ -382,8 +382,15 @@ public class IgniteApplicationMasterSelfTest extends TestCase { return 0; } - /** {@inheritDoc} */ - @Override public void updateBlacklist(List blacklistAdditions, List blacklistRemovals) { + /** + * Update application's blacklist with addition or removal resources. + * + * @param blacklistAdditions list of resources which should be added to the + * application blacklist + * @param blacklistRemovals list of resources which should be removed from the + * application blacklist + */ + public void updateBlacklist(List blacklistAdditions, List blacklistRemovals) { // No-op. } }