You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2015/03/19 02:49:18 UTC
ambari git commit: AMBARI-10127. Sanitize view package
names/versions. (yusaku)
Repository: ambari
Updated Branches:
refs/heads/trunk 442ad8322 -> 8ced13165
AMBARI-10127. Sanitize view package names/versions. (yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8ced1316
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8ced1316
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8ced1316
Branch: refs/heads/trunk
Commit: 8ced13165bf2b13dc6ba7e5223fac5b5f80906ff
Parents: 442ad83
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Wed Mar 18 18:48:56 2015 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Wed Mar 18 18:48:56 2015 -0700
----------------------------------------------------------------------
contrib/views/jobs/src/main/resources/view.xml | 2 +-
contrib/views/slider/pom.xml | 19 +-----------------
.../views/slider/src/main/resources/view.xml | 2 +-
contrib/views/tez/pom.xml | 21 ++++----------------
contrib/views/tez/readme.md | 4 ++--
pom.xml | 6 +++---
6 files changed, 12 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8ced1316/contrib/views/jobs/src/main/resources/view.xml
----------------------------------------------------------------------
diff --git a/contrib/views/jobs/src/main/resources/view.xml b/contrib/views/jobs/src/main/resources/view.xml
index a17d06d..6893ec5 100644
--- a/contrib/views/jobs/src/main/resources/view.xml
+++ b/contrib/views/jobs/src/main/resources/view.xml
@@ -17,7 +17,7 @@ limitations under the License. Kerberos, LDAP, Custom. Binary/Htt
<view>
<name>JOBS</name>
<label>Jobs View</label>
- <version>1.0.0</version>
+ <version>2.0.0</version>
<parameter>
<name>yarn.ats.url</name>
<description>The URL to the YARN Application Timeline Server, used to provide Jobs information, typically, this is the yarn.timeline-service.webapp.address property in the yarn-site.xml configuration. For example: http://yarn.ats.address:8188</description>
http://git-wip-us.apache.org/repos/asf/ambari/blob/8ced1316/contrib/views/slider/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/slider/pom.xml b/contrib/views/slider/pom.xml
index 3f723b9..cf5c0c5 100644
--- a/contrib/views/slider/pom.xml
+++ b/contrib/views/slider/pom.xml
@@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari.contrib.views</groupId>
<artifactId>slider</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>Slider</name>
<parent>
@@ -123,23 +123,6 @@
</dependency>
</dependencies>
- <repositories>
- <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>
<ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
<nodejs.directory>${basedir}/target/nodejs</nodejs.directory>
http://git-wip-us.apache.org/repos/asf/ambari/blob/8ced1316/contrib/views/slider/src/main/resources/view.xml
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/view.xml b/contrib/views/slider/src/main/resources/view.xml
index 895376d..e095375 100644
--- a/contrib/views/slider/src/main/resources/view.xml
+++ b/contrib/views/slider/src/main/resources/view.xml
@@ -17,7 +17,7 @@ limitations under the License. Kerberos, LDAP, Custom. Binary/Htt
<view>
<name>SLIDER</name>
<label>Slider Apps View</label>
- <version>1.0.0</version>
+ <version>2.0.0</version>
<parameter>
<name>ambari.server.url</name>
<description>Ambari Server Cluster REST API URL (for example:
http://git-wip-us.apache.org/repos/asf/ambari/blob/8ced1316/contrib/views/tez/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/tez/pom.xml b/contrib/views/tez/pom.xml
index 1bd8838..8e18702 100644
--- a/contrib/views/tez/pom.xml
+++ b/contrib/views/tez/pom.xml
@@ -27,26 +27,13 @@
<tez.version>0.6.0</tez.version>
</properties>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.ambari</groupId>
- <artifactId>tez-ambari-view</artifactId>
+ <groupId>org.apache.ambari.contrib.views</groupId>
+ <artifactId>tez-view</artifactId>
<name>Tez</name>
<version>${tez.view.version}</version>
- <description>Tez Ambari View</description>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Development Snapshot Repository</name>
- <url>https://repository.apache.org/content/repositories/snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <build>
+ <description>Tez View</description>
+ <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/ambari/blob/8ced1316/contrib/views/tez/readme.md
----------------------------------------------------------------------
diff --git a/contrib/views/tez/readme.md b/contrib/views/tez/readme.md
index 99ef53c..fdb9459 100644
--- a/contrib/views/tez/readme.md
+++ b/contrib/views/tez/readme.md
@@ -35,7 +35,7 @@ The view can be built as a maven project.
The build will produce the view archive.
- target/tez-ambari-view-0.6.0-SNAPSHOT.jar
+ target/tez-view-0.6.0-SNAPSHOT.jar
Configuration
-----
@@ -71,7 +71,7 @@ Use the [Ambari Vagrant](https://cwiki.apache.org/confluence/display/AMBARI/Quic
Deploy the TEZ view into Ambari.
- cp tez-ambari-view-0.6.0-SNAPSHOT.jar /var/lib/ambari-server/resources/views/
+ cp tez-view-0.6.0-SNAPSHOT.jar /var/lib/ambari-server/resources/views/
ambari-server restart
From the Ambari Administration interface, create a TEZ view instance.
http://git-wip-us.apache.org/repos/asf/ambari/blob/8ced1316/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9fc2c90..0a5cb76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,7 +173,7 @@
<configuration>
<name>package-version</name>
<value>${project.version}</value>
- <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)((\.|-).*)?</regex>
<replacement>$1.$2.$3</replacement>
<failIfNoMatch>true</failIfNoMatch>
</configuration>
@@ -186,8 +186,8 @@
<configuration>
<name>package-release</name>
<value>${project.version}</value>
- <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)(([0-9]+)|(SNAPSHOT)|(techwin)).*</regex>
- <replacement>$5</replacement>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)((\.|-)(([0-9]+)|(SNAPSHOT)|(techwin)).*)?</regex>
+ <replacement>$6</replacement>
<failIfNoMatch>true</failIfNoMatch>
</configuration>
</execution>