You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2014/05/29 23:26:24 UTC

git commit: AMBARI-5947. Slider Apps view cannot build to to jackson-mapper-asl version conflict. (srimanth)

Repository: ambari
Updated Branches:
  refs/heads/branch-1.6.0.slider 07556168f -> ab330ba45


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/ab330ba4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ab330ba4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ab330ba4

Branch: refs/heads/branch-1.6.0.slider
Commit: ab330ba457ce84dce0c192adac30cc91b8b55d8a
Parents: 0755616
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Thu May 29 14:24:23 2014 -0700
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Thu May 29 14:24:23 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/ab330ba4/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>