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/09/02 20:16:56 UTC
git commit: AMBARI-7116. Slider View: 3rd party libraries used by
view should be updated (srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 33335cef4 -> 29286b4b7
AMBARI-7116. Slider View: 3rd party libraries used by view should be updated (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/29286b4b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/29286b4b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/29286b4b
Branch: refs/heads/trunk
Commit: 29286b4b77c78766e6370084f615fc0fd4afe4db
Parents: 33335ce
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Tue Sep 2 11:00:24 2014 -0700
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Tue Sep 2 11:00:24 2014 -0700
----------------------------------------------------------------------
contrib/views/slider/pom.xml | 57 +++++++++++++++-----
.../slider/SliderAppsViewControllerImpl.java | 2 +-
2 files changed, 45 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/29286b4b/contrib/views/slider/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/slider/pom.xml b/contrib/views/slider/pom.xml
index f3d6ad0..4e57ec0 100644
--- a/contrib/views/slider/pom.xml
+++ b/contrib/views/slider/pom.xml
@@ -31,12 +31,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.slider</groupId>
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
<scope>test</scope>
</dependency>
@@ -337,13 +337,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
- <exclusions>
- </exclusions>
- </dependency>
- <dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
<version>${jcommander.version}</version>
@@ -354,6 +347,29 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- ======================================================== -->
+ <!-- Jetty -->
+ <!-- ======================================================== -->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-sslengine</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.codahale.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ <version>${metrics.version}</version>
+ </dependency>
</dependencies>
<repositories>
@@ -362,24 +378,39 @@
<name>SliderAppsLibsRepo</name>
<url>file://${project.basedir}/lib</url>
</repository>
+ <repository>
+ <id>ASF Staging</id>
+ <url>https://repository.apache.org/content/groups/staging/</url>
+ </repository>
+ <repository>
+ <id>ASF Snapshots</id>
+ <url>https://repository.apache.org/content/repositories/snapshots/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
</repositories>
<properties>
- <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>
<!-- deprecated, moved to top component -->
<!-- <ambari.version>1.3.0-SNAPSHOT</ambari.version> -->
- <hadoop.version>2.4.0</hadoop.version>
+ <hadoop.version>2.6.0-SNAPSHOT</hadoop.version>
<avro.version>1.7.4</avro.version>
<bigtop.version>0.7.0</bigtop.version>
<commons-configuration.version>1.6</commons-configuration.version>
<commons-lang.version>2.6</commons-lang.version>
- <httpclient.version>4.2.5</httpclient.version>
+ <httpclient.version>3.1</httpclient.version>
<jcommander.version>1.30</jcommander.version>
<curator.version>2.4.1</curator.version>
<zookeeper.version>3.4.5</zookeeper.version>
+ <jetty.version>6.1.26</jetty.version>
+ <metrics.version>3.0.1</metrics.version>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/ambari/blob/29286b4b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
index deb6b70..6b3b3f5 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
@@ -744,7 +744,7 @@ public class SliderAppsViewControllerImpl implements SliderAppsViewController {
createArgs.template = appConfigJsonFile;
createArgs.resources = resourcesJsonFile;
createArgs.image = new Path(hdfsLocation
- + "/slider/agent/slider-agent.tar.gz");
+ + "/user/yarn/agent/slider-agent.tar.gz");
ClassLoader currentClassLoader = Thread.currentThread()
.getContextClassLoader();