Repository: ambari Updated Branches: refs/heads/trunk bf2484a7d -> 0ba293c1e
AMBARI-5947. Slider Apps view cannot build to to jackson-mapper-asl version conflict. (srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0ba293c1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0ba293c1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0ba293c1 Branch: refs/heads/trunk Commit: 0ba293c1ea95eaf2eb9d01ae24fbe727ab18a24e Parents: bf2484a Author: Srimanth Gunturi <[email protected]> Authored: Thu May 29 14:24:23 2014 -0700 Committer: Srimanth Gunturi <[email protected]> Committed: Thu May 29 14:26:50 2014 -0700 ---------------------------------------------------------------------- contrib/views/slider/pom.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0ba293c1/contrib/views/slider/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/slider/pom.xml b/contrib/views/slider/pom.xml index 1bcd294..a4e2539 100644 --- a/contrib/views/slider/pom.xml +++ b/contrib/views/slider/pom.xml @@ -24,6 +24,11 @@ <dependencies> <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + <version>1.9.2</version> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <version>${hadoop-version}</version> @@ -360,7 +365,7 @@ </repositories> <properties> - <hadoop-version>2.2.0</hadoop-version> + <hadoop-version>2.4.0</hadoop-version> <nodejs.directory>${basedir}/target/nodejs</nodejs.directory> <npm.version>1.4.3</npm.version> <ui.directory>${basedir}/src/main/resources/ui</ui.directory>
