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 2015/12/02 01:53:13 UTC
ambari git commit: AMBARI-14138. Upgrade Ambari Views to Hadoop 2.7.1
jar which has the fix for HDFS-7931
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 0612fa0c4 -> 198dc2ccc
AMBARI-14138. Upgrade Ambari Views to Hadoop 2.7.1 jar which has the fix for HDFS-7931
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/198dc2cc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/198dc2cc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/198dc2cc
Branch: refs/heads/branch-2.1
Commit: 198dc2cccb74c65bf970080629426a690a8465e7
Parents: 0612fa0
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Tue Dec 1 09:46:28 2015 -0800
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Tue Dec 1 16:52:51 2015 -0800
----------------------------------------------------------------------
contrib/views/capacity-scheduler/pom.xml | 7 +++----
contrib/views/files/pom.xml | 11 +++++------
contrib/views/hive/pom.xml | 19 +++++++++----------
contrib/views/jobs/pom.xml | 4 ++--
contrib/views/pig/pom.xml | 13 ++++++-------
contrib/views/pom.xml | 5 +++--
contrib/views/slider/pom.xml | 2 +-
contrib/views/storm/pom.xml | 2 +-
contrib/views/tez/pom.xml | 8 ++++----
contrib/views/utils/pom.xml | 13 ++++++-------
10 files changed, 40 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/198dc2cc/contrib/views/capacity-scheduler/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/capacity-scheduler/pom.xml b/contrib/views/capacity-scheduler/pom.xml
index df48ef4..cacd3d3 100644
--- a/contrib/views/capacity-scheduler/pom.xml
+++ b/contrib/views/capacity-scheduler/pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari.contrib.views</groupId>
<artifactId>capacity-scheduler</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.0-SNAPSHOT</version>
<name>Capacity Scheduler</name>
<parent>
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>tomcat</groupId>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.ambari.contrib.views</groupId>
<artifactId>ambari-views-utils</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
@@ -92,7 +92,6 @@
</dependencies>
<properties>
- <hadoop-version>2.6.0</hadoop-version>
<ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
<ui.directory>${basedir}/src/main/resources/ui</ui.directory>
</properties>
http://git-wip-us.apache.org/repos/asf/ambari/blob/198dc2cc/contrib/views/files/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/files/pom.xml b/contrib/views/files/pom.xml
index 2d090d4..a5a5bca 100644
--- a/contrib/views/files/pom.xml
+++ b/contrib/views/files/pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari.contrib.views</groupId>
<artifactId>files</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.0-SNAPSHOT</version>
<name>Files</name>
<parent>
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>tomcat</groupId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>tomcat</groupId>
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
<scope>test</scope>
</dependency>
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.ambari.contrib.views</groupId>
<artifactId>ambari-views-utils</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -110,7 +110,6 @@
<properties>
<ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
- <hadoop-version>2.6.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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/198dc2cc/contrib/views/hive/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/hive/pom.xml b/contrib/views/hive/pom.xml
index 7fb5c62..9f3f1f7 100644
--- a/contrib/views/hive/pom.xml
+++ b/contrib/views/hive/pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari.contrib.views</groupId>
<artifactId>hive</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.0-SNAPSHOT</version>
<name>Hive</name>
<parent>
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>tomcat</groupId>
@@ -112,7 +112,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>tomcat</groupId>
@@ -123,17 +123,17 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-common</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-client</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
@@ -193,13 +193,13 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ambari.contrib.views</groupId>
<artifactId>ambari-views-utils</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-validator</groupId>
@@ -224,10 +224,9 @@
</dependencies>
<properties>
- <hadoop-version>2.7.0</hadoop-version>
<ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
<hive-version>1.0.0</hive-version>
- <ambari.version>2.1.0-SNAPSHOT</ambari.version>
+ <ambari.version>2.1.0.0.0</ambari.version>
</properties>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/ambari/blob/198dc2cc/contrib/views/jobs/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/jobs/pom.xml b/contrib/views/jobs/pom.xml
index ef3bc23..d797ebd 100644
--- a/contrib/views/jobs/pom.xml
+++ b/contrib/views/jobs/pom.xml
@@ -53,8 +53,8 @@
<configuration>
<name>ambariVersion</name>
<value>${project.version}</value>
- <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
- <replacement>$1.$2.$3</replacement>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+ <replacement>$1.$2.$3.$4</replacement>
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/ambari/blob/198dc2cc/contrib/views/pig/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/pig/pom.xml b/contrib/views/pig/pom.xml
index 92cef60..b89b904 100644
--- a/contrib/views/pig/pom.xml
+++ b/contrib/views/pig/pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari.contrib.views</groupId>
<artifactId>pig</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.0-SNAPSHOT</version>
<name>Pig</name>
<parent>
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>tomcat</groupId>
@@ -96,7 +96,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>tomcat</groupId>
@@ -122,7 +122,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -133,14 +133,13 @@
<dependency>
<groupId>org.apache.ambari.contrib.views</groupId>
<artifactId>ambari-views-utils</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<properties>
<ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
- <hadoop-version>2.2.0</hadoop-version>
- <ambari.version>2.1.0-SNAPSHOT</ambari.version>
+ <ambari.version>2.1.0.0.0</ambari.version>
<ui.directory>${basedir}/src/main/resources/ui/pig-web</ui.directory>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/ambari/blob/198dc2cc/contrib/views/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/pom.xml b/contrib/views/pom.xml
index 54ab5ae..32ea74f 100644
--- a/contrib/views/pom.xml
+++ b/contrib/views/pom.xml
@@ -29,8 +29,9 @@
<version>2.1.0.0.0</version>
<name>Ambari Contrib Views</name>
<properties>
- <ambari.version>2.1.0-SNAPSHOT</ambari.version>
+ <ambari.version>2.1.0.0.0</ambari.version>
<ambari.dir>${project.parent.parent.basedir}</ambari.dir>
+ <hadoop.version>2.7.1</hadoop.version>
</properties>
<modules>
<module>files</module>
@@ -191,7 +192,7 @@
<dependency>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-views</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.0.0.0</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/ambari/blob/198dc2cc/contrib/views/slider/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/slider/pom.xml b/contrib/views/slider/pom.xml
index f0cf816..f66d71a 100644
--- a/contrib/views/slider/pom.xml
+++ b/contrib/views/slider/pom.xml
@@ -129,7 +129,7 @@
<dependency>
<groupId>org.apache.ambari.contrib.views</groupId>
<artifactId>ambari-views-utils</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/ambari/blob/198dc2cc/contrib/views/storm/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/storm/pom.xml b/contrib/views/storm/pom.xml
index e1eb4bf..d7bf1a7 100644
--- a/contrib/views/storm/pom.xml
+++ b/contrib/views/storm/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.ambari.contrib.views</groupId>
<artifactId>storm-view</artifactId>
<name>Storm_Monitoring</name>
- <version>0.1.0</version>
+ <version>0.1.0.0</version>
<description>Storm Monitoring View</description>
<build>
http://git-wip-us.apache.org/repos/asf/ambari/blob/198dc2cc/contrib/views/tez/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/tez/pom.xml b/contrib/views/tez/pom.xml
index 6ce4175..450cf9f 100644
--- a/contrib/views/tez/pom.xml
+++ b/contrib/views/tez/pom.xml
@@ -23,7 +23,7 @@
</parent>
<properties>
<ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
- <tez.view.version>0.7.0-SNAPSHOT</tez.view.version>
+ <tez.view.version>0.7.0.0-SNAPSHOT</tez.view.version>
<tez.version>0.7.0</tez.version>
</properties>
<modelVersion>4.0.0</modelVersion>
@@ -62,8 +62,8 @@
<configuration>
<name>ambariVersion</name>
<value>${project.version}</value>
- <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
- <replacement>$1.$2.$3</replacement>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+ <replacement>$1.$2.$3.$4</replacement>
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
@@ -210,7 +210,7 @@
<dependency>
<groupId>org.apache.ambari.contrib.views</groupId>
<artifactId>ambari-views-utils</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/ambari/blob/198dc2cc/contrib/views/utils/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/utils/pom.xml b/contrib/views/utils/pom.xml
index 7a9bfc0..eaf6b49 100644
--- a/contrib/views/utils/pom.xml
+++ b/contrib/views/utils/pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari.contrib.views</groupId>
<artifactId>ambari-views-utils</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.1.0-SNAPSHOT</version>
<name>Ambari View Utils</name>
<parent>
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>tomcat</groupId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>tomcat</groupId>
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-common</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -86,7 +86,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
<scope>test</scope>
</dependency>
@@ -136,13 +136,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-azure</artifactId>
- <version>${hadoop-version}</version>
+ <version>${hadoop.version}</version>
</dependency>
</dependencies>
<properties>
<ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
- <hadoop-version>2.7.0</hadoop-version>
</properties>
<build>
</build>