You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/10/13 16:51:27 UTC
[1/2] ambari git commit: AMBARI-13403. Ambari unable to build rpms
with 4 digit versions (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 e9263e486 -> 3ba8c39c5
refs/heads/branch-2.1.2 99da5c68e -> 54823edf7
AMBARI-13403. Ambari unable to build rpms with 4 digit versions (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/54823edf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/54823edf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/54823edf
Branch: refs/heads/branch-2.1.2
Commit: 54823edf76578f966e79770c081340323653cf19
Parents: 99da5c6
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Tue Oct 13 17:51:12 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Tue Oct 13 17:51:12 2015 +0300
----------------------------------------------------------------------
ambari-admin/pom.xml | 8 ++++----
ambari-agent/pom.xml | 8 ++++----
ambari-client/groovy-client/pom.xml | 4 ++--
ambari-client/pom.xml | 4 ++--
ambari-client/python-client/pom.xml | 4 ++--
ambari-metrics/ambari-metrics-assembly/pom.xml | 8 ++++----
ambari-metrics/ambari-metrics-common/pom.xml | 2 +-
ambari-metrics/ambari-metrics-flume-sink/pom.xml | 8 ++++----
ambari-metrics/ambari-metrics-hadoop-sink/pom.xml | 8 ++++----
ambari-metrics/ambari-metrics-host-monitoring/pom.xml | 8 ++++----
ambari-metrics/ambari-metrics-kafka-sink/pom.xml | 8 ++++----
ambari-metrics/ambari-metrics-storm-sink/pom.xml | 8 ++++----
ambari-metrics/ambari-metrics-timelineservice/pom.xml | 10 +++++-----
ambari-metrics/pom.xml | 10 +++++-----
ambari-project/pom.xml | 4 ++--
ambari-server/pom.xml | 8 ++++----
ambari-shell/ambari-groovy-shell/pom.xml | 6 +++---
ambari-shell/ambari-python-shell/pom.xml | 4 ++--
ambari-shell/pom.xml | 4 ++--
ambari-views/pom.xml | 8 ++++----
ambari-web/pom.xml | 8 ++++----
docs/pom.xml | 2 +-
pom.xml | 10 +++++-----
23 files changed, 76 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/54823edf/ambari-admin/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml
index 8985c1e..43764b8 100644
--- a/ambari-admin/pom.xml
+++ b/ambari-admin/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -27,7 +27,7 @@
<artifactId>ambari-admin</artifactId>
<packaging>jar</packaging>
<name>Ambari Admin View</name>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<description>Admin control panel</description>
<build>
<plugins>
@@ -51,8 +51,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/54823edf/ambari-agent/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index b544d75..83852cd 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -19,14 +19,14 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-agent</artifactId>
<packaging>pom</packaging>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Agent</name>
<description>Ambari Agent</description>
<properties>
@@ -77,8 +77,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/54823edf/ambari-client/groovy-client/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-client/groovy-client/pom.xml b/ambari-client/groovy-client/pom.xml
index 6b08bd0..1568c94 100644
--- a/ambari-client/groovy-client/pom.xml
+++ b/ambari-client/groovy-client/pom.xml
@@ -12,14 +12,14 @@
<parent>
<artifactId>ambari-client</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../../ambari-client/</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari</groupId>
<artifactId>groovy-client</artifactId>
<packaging>jar</packaging>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Groovy Client</name>
<description>Ambari Groovy client</description>
<properties>
http://git-wip-us.apache.org/repos/asf/ambari/blob/54823edf/ambari-client/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-client/pom.xml b/ambari-client/pom.xml
index 4bba701..44b5948 100755
--- a/ambari-client/pom.xml
+++ b/ambari-client/pom.xml
@@ -20,14 +20,14 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-client</artifactId>
<packaging>pom</packaging>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Client</name>
<description>Ambari client</description>
<modules>
http://git-wip-us.apache.org/repos/asf/ambari/blob/54823edf/ambari-client/python-client/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-client/python-client/pom.xml b/ambari-client/python-client/pom.xml
index 02fa516..b439cce 100644
--- a/ambari-client/python-client/pom.xml
+++ b/ambari-client/python-client/pom.xml
@@ -19,14 +19,14 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-client</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../../ambari-client</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari</groupId>
<artifactId>python-client</artifactId>
<packaging>pom</packaging>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Python Client</name>
<description>Ambari Python client</description>
<properties>
http://git-wip-us.apache.org/repos/asf/ambari/blob/54823edf/ambari-metrics/ambari-metrics-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml b/ambari-metrics/ambari-metrics-assembly/pom.xml
index dead742..c8b9bb8 100644
--- a/ambari-metrics/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics/ambari-metrics-assembly/pom.xml
@@ -23,13 +23,13 @@
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-assembly</artifactId>
<name>Ambari Metrics Assembly</name>
<packaging>pom</packaging>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<description>Ambari Metrics</description>
<properties>
@@ -76,8 +76,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/54823edf/ambari-metrics/ambari-metrics-common/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-common/pom.xml b/ambari-metrics/ambari-metrics-common/pom.xml
index d47b03f..fe330bd 100644
--- a/ambari-metrics/ambari-metrics-common/pom.xml
+++ b/ambari-metrics/ambari-metrics-common/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-common</artifactId>
http://git-wip-us.apache.org/repos/asf/ambari/blob/54823edf/ambari-metrics/ambari-metrics-flume-sink/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-flume-sink/pom.xml b/ambari-metrics/ambari-metrics-flume-sink/pom.xml
index af5d794..76d2b83 100644
--- a/ambari-metrics/ambari-metrics-flume-sink/pom.xml
+++ b/ambari-metrics/ambari-metrics-flume-sink/pom.xml
@@ -22,11 +22,11 @@ limitations under the License.
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-flume-sink</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Metrics Flume Sink</name>
<packaging>jar</packaging>
<build>
@@ -76,8 +76,8 @@ limitations under the License.
<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/54823edf/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml b/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
index 62d095b..dbe48ca 100644
--- a/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
+++ b/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
@@ -22,11 +22,11 @@ limitations under the License.
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-hadoop-sink</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Metrics Hadoop Sink</name>
<packaging>jar</packaging>
<properties>
@@ -82,8 +82,8 @@ limitations under the License.
<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/54823edf/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-host-monitoring/pom.xml b/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
index b0fe4d7..426b27b 100644
--- a/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
+++ b/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
@@ -22,11 +22,11 @@
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<artifactId>ambari-metrics-host-monitoring</artifactId>
<name>Ambari Metrics Monitor</name>
<properties>
@@ -72,8 +72,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/54823edf/ambari-metrics/ambari-metrics-kafka-sink/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-kafka-sink/pom.xml b/ambari-metrics/ambari-metrics-kafka-sink/pom.xml
index d4590d3..008b86b 100644
--- a/ambari-metrics/ambari-metrics-kafka-sink/pom.xml
+++ b/ambari-metrics/ambari-metrics-kafka-sink/pom.xml
@@ -22,11 +22,11 @@ limitations under the License.
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-kafka-sink</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Metrics Kafka Sink</name>
<packaging>jar</packaging>
<build>
@@ -94,8 +94,8 @@ limitations under the License.
<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/54823edf/ambari-metrics/ambari-metrics-storm-sink/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-storm-sink/pom.xml b/ambari-metrics/ambari-metrics-storm-sink/pom.xml
index d3ffe22..84bb758 100644
--- a/ambari-metrics/ambari-metrics-storm-sink/pom.xml
+++ b/ambari-metrics/ambari-metrics-storm-sink/pom.xml
@@ -22,11 +22,11 @@ limitations under the License.
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-storm-sink</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Metrics Storm Sink</name>
<packaging>jar</packaging>
@@ -61,8 +61,8 @@ limitations under the License.
<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/54823edf/ambari-metrics/ambari-metrics-timelineservice/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
index 0d9f35d..057b0d2 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
@@ -22,11 +22,11 @@
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-timelineservice</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Metrics Collector</name>
<packaging>jar</packaging>
@@ -61,8 +61,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>
@@ -253,7 +253,7 @@
<dependency>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-metrics-common</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ambari/blob/54823edf/ambari-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index 05c2865..4f34f54 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -19,7 +19,7 @@
<groupId>org.apache.ambari</groupId>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<packaging>pom</packaging>
<modules>
<module>ambari-metrics-common</module>
@@ -124,8 +124,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>
@@ -184,8 +184,8 @@
<configuration>
<name>package-version</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>true</failIfNoMatch>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/ambari/blob/54823edf/ambari-project/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index e94bd69..04b668b 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<description>Apache Ambari Project POM</description>
<name>Apache Ambari Project POM</name>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/ambari/blob/54823edf/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 0b1870b..ae1b7b7 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
<artifactId>ambari-server</artifactId>
<packaging>${packagingFormat}</packaging>
<name>Ambari Server</name>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<description>Ambari Server</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,8 +69,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/54823edf/ambari-shell/ambari-groovy-shell/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-shell/ambari-groovy-shell/pom.xml b/ambari-shell/ambari-groovy-shell/pom.xml
index 745cd87..5633796 100644
--- a/ambari-shell/ambari-groovy-shell/pom.xml
+++ b/ambari-shell/ambari-groovy-shell/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-shell</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../../ambari-shell</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
<artifactId>ambari-groovy-shell</artifactId>
<packaging>jar</packaging>
<name>Ambari Groovy Shell</name>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<description>Ambari Groovy Shell</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.ambari</groupId>
<artifactId>groovy-client</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
http://git-wip-us.apache.org/repos/asf/ambari/blob/54823edf/ambari-shell/ambari-python-shell/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-shell/ambari-python-shell/pom.xml b/ambari-shell/ambari-python-shell/pom.xml
index 66928d0..8eab67d 100644
--- a/ambari-shell/ambari-python-shell/pom.xml
+++ b/ambari-shell/ambari-python-shell/pom.xml
@@ -19,14 +19,14 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-shell</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../../ambari-shell</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-python-shell</artifactId>
<packaging>pom</packaging>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Python Shell</name>
<description>Ambari Python Shell</description>
<properties>
http://git-wip-us.apache.org/repos/asf/ambari/blob/54823edf/ambari-shell/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-shell/pom.xml b/ambari-shell/pom.xml
index dc90261..ea128ee 100644
--- a/ambari-shell/pom.xml
+++ b/ambari-shell/pom.xml
@@ -21,14 +21,14 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-shell</artifactId>
<packaging>pom</packaging>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Shell</name>
<description>Ambari Shell</description>
<modules>
http://git-wip-us.apache.org/repos/asf/ambari/blob/54823edf/ambari-views/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-views/pom.xml b/ambari-views/pom.xml
index 6fe6004..d79ca58 100644
--- a/ambari-views/pom.xml
+++ b/ambari-views/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -28,7 +28,7 @@
<artifactId>ambari-views</artifactId>
<packaging>jar</packaging>
<name>Ambari Views</name>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<description>Ambari View interfaces.</description>
<dependencies>
<dependency>
@@ -75,8 +75,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/54823edf/ambari-web/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml
index 6d5bd75..01675bd 100644
--- a/ambari-web/pom.xml
+++ b/ambari-web/pom.xml
@@ -20,14 +20,14 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-web</artifactId>
<packaging>pom</packaging>
<name>Ambari Web</name>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<description>Ambari Web</description>
<properties>
<ambari.dir>${project.parent.parent.basedir}</ambari.dir>
@@ -55,8 +55,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/54823edf/docs/pom.xml
----------------------------------------------------------------------
diff --git a/docs/pom.xml b/docs/pom.xml
index 6ff75ea..4da88dc 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari</groupId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<artifactId>ambari</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/ambari/blob/54823edf/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 593cd67..93ab81f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<artifactId>ambari</artifactId>
<packaging>pom</packaging>
<name>Ambari Main</name>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<description>Ambari</description>
<url>http://ambari.apache.org/</url>
<scm>
@@ -173,8 +173,8 @@
<configuration>
<name>package-version</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>true</failIfNoMatch>
</configuration>
</execution>
@@ -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>$6</replacement>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)((\.|-)(([0-9]+)|(SNAPSHOT)|(techwin)).*)?</regex>
+ <replacement>$7</replacement>
<failIfNoMatch>true</failIfNoMatch>
</configuration>
</execution>
[2/2] ambari git commit: AMBARI-13403. Ambari unable to build rpms
with 4 digit versions (aonishuk)
Posted by ao...@apache.org.
AMBARI-13403. Ambari unable to build rpms with 4 digit versions (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3ba8c39c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3ba8c39c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3ba8c39c
Branch: refs/heads/branch-2.1
Commit: 3ba8c39c5ee67d0970d4529e18ce296e844c741d
Parents: e9263e4
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Tue Oct 13 17:51:14 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Tue Oct 13 17:51:14 2015 +0300
----------------------------------------------------------------------
ambari-admin/pom.xml | 8 ++++----
ambari-agent/pom.xml | 8 ++++----
ambari-client/groovy-client/pom.xml | 4 ++--
ambari-client/pom.xml | 4 ++--
ambari-client/python-client/pom.xml | 4 ++--
ambari-metrics/ambari-metrics-assembly/pom.xml | 8 ++++----
ambari-metrics/ambari-metrics-common/pom.xml | 2 +-
ambari-metrics/ambari-metrics-flume-sink/pom.xml | 8 ++++----
ambari-metrics/ambari-metrics-hadoop-sink/pom.xml | 8 ++++----
ambari-metrics/ambari-metrics-host-monitoring/pom.xml | 8 ++++----
ambari-metrics/ambari-metrics-kafka-sink/pom.xml | 8 ++++----
ambari-metrics/ambari-metrics-storm-sink/pom.xml | 8 ++++----
ambari-metrics/ambari-metrics-timelineservice/pom.xml | 10 +++++-----
ambari-metrics/pom.xml | 10 +++++-----
ambari-project/pom.xml | 4 ++--
ambari-server/pom.xml | 8 ++++----
ambari-shell/ambari-groovy-shell/pom.xml | 6 +++---
ambari-shell/ambari-python-shell/pom.xml | 4 ++--
ambari-shell/pom.xml | 4 ++--
ambari-views/pom.xml | 8 ++++----
ambari-web/pom.xml | 8 ++++----
docs/pom.xml | 2 +-
pom.xml | 10 +++++-----
23 files changed, 76 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ba8c39c/ambari-admin/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml
index 8985c1e..43764b8 100644
--- a/ambari-admin/pom.xml
+++ b/ambari-admin/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -27,7 +27,7 @@
<artifactId>ambari-admin</artifactId>
<packaging>jar</packaging>
<name>Ambari Admin View</name>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<description>Admin control panel</description>
<build>
<plugins>
@@ -51,8 +51,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/3ba8c39c/ambari-agent/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index b544d75..83852cd 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -19,14 +19,14 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-agent</artifactId>
<packaging>pom</packaging>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Agent</name>
<description>Ambari Agent</description>
<properties>
@@ -77,8 +77,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/3ba8c39c/ambari-client/groovy-client/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-client/groovy-client/pom.xml b/ambari-client/groovy-client/pom.xml
index 6b08bd0..1568c94 100644
--- a/ambari-client/groovy-client/pom.xml
+++ b/ambari-client/groovy-client/pom.xml
@@ -12,14 +12,14 @@
<parent>
<artifactId>ambari-client</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../../ambari-client/</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari</groupId>
<artifactId>groovy-client</artifactId>
<packaging>jar</packaging>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Groovy Client</name>
<description>Ambari Groovy client</description>
<properties>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ba8c39c/ambari-client/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-client/pom.xml b/ambari-client/pom.xml
index 4bba701..44b5948 100755
--- a/ambari-client/pom.xml
+++ b/ambari-client/pom.xml
@@ -20,14 +20,14 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-client</artifactId>
<packaging>pom</packaging>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Client</name>
<description>Ambari client</description>
<modules>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ba8c39c/ambari-client/python-client/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-client/python-client/pom.xml b/ambari-client/python-client/pom.xml
index 02fa516..b439cce 100644
--- a/ambari-client/python-client/pom.xml
+++ b/ambari-client/python-client/pom.xml
@@ -19,14 +19,14 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-client</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../../ambari-client</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari</groupId>
<artifactId>python-client</artifactId>
<packaging>pom</packaging>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Python Client</name>
<description>Ambari Python client</description>
<properties>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ba8c39c/ambari-metrics/ambari-metrics-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml b/ambari-metrics/ambari-metrics-assembly/pom.xml
index dead742..c8b9bb8 100644
--- a/ambari-metrics/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics/ambari-metrics-assembly/pom.xml
@@ -23,13 +23,13 @@
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-assembly</artifactId>
<name>Ambari Metrics Assembly</name>
<packaging>pom</packaging>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<description>Ambari Metrics</description>
<properties>
@@ -76,8 +76,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/3ba8c39c/ambari-metrics/ambari-metrics-common/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-common/pom.xml b/ambari-metrics/ambari-metrics-common/pom.xml
index d47b03f..fe330bd 100644
--- a/ambari-metrics/ambari-metrics-common/pom.xml
+++ b/ambari-metrics/ambari-metrics-common/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-common</artifactId>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ba8c39c/ambari-metrics/ambari-metrics-flume-sink/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-flume-sink/pom.xml b/ambari-metrics/ambari-metrics-flume-sink/pom.xml
index af5d794..76d2b83 100644
--- a/ambari-metrics/ambari-metrics-flume-sink/pom.xml
+++ b/ambari-metrics/ambari-metrics-flume-sink/pom.xml
@@ -22,11 +22,11 @@ limitations under the License.
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-flume-sink</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Metrics Flume Sink</name>
<packaging>jar</packaging>
<build>
@@ -76,8 +76,8 @@ limitations under the License.
<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/3ba8c39c/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml b/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
index 62d095b..dbe48ca 100644
--- a/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
+++ b/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
@@ -22,11 +22,11 @@ limitations under the License.
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-hadoop-sink</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Metrics Hadoop Sink</name>
<packaging>jar</packaging>
<properties>
@@ -82,8 +82,8 @@ limitations under the License.
<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/3ba8c39c/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-host-monitoring/pom.xml b/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
index b0fe4d7..426b27b 100644
--- a/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
+++ b/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
@@ -22,11 +22,11 @@
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<artifactId>ambari-metrics-host-monitoring</artifactId>
<name>Ambari Metrics Monitor</name>
<properties>
@@ -72,8 +72,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/3ba8c39c/ambari-metrics/ambari-metrics-kafka-sink/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-kafka-sink/pom.xml b/ambari-metrics/ambari-metrics-kafka-sink/pom.xml
index d4590d3..008b86b 100644
--- a/ambari-metrics/ambari-metrics-kafka-sink/pom.xml
+++ b/ambari-metrics/ambari-metrics-kafka-sink/pom.xml
@@ -22,11 +22,11 @@ limitations under the License.
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-kafka-sink</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Metrics Kafka Sink</name>
<packaging>jar</packaging>
<build>
@@ -94,8 +94,8 @@ limitations under the License.
<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/3ba8c39c/ambari-metrics/ambari-metrics-storm-sink/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-storm-sink/pom.xml b/ambari-metrics/ambari-metrics-storm-sink/pom.xml
index d3ffe22..84bb758 100644
--- a/ambari-metrics/ambari-metrics-storm-sink/pom.xml
+++ b/ambari-metrics/ambari-metrics-storm-sink/pom.xml
@@ -22,11 +22,11 @@ limitations under the License.
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-storm-sink</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Metrics Storm Sink</name>
<packaging>jar</packaging>
@@ -61,8 +61,8 @@ limitations under the License.
<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/3ba8c39c/ambari-metrics/ambari-metrics-timelineservice/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
index 0d9f35d..057b0d2 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
@@ -22,11 +22,11 @@
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-timelineservice</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Metrics Collector</name>
<packaging>jar</packaging>
@@ -61,8 +61,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>
@@ -253,7 +253,7 @@
<dependency>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-metrics-common</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ba8c39c/ambari-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index 05c2865..4f34f54 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -19,7 +19,7 @@
<groupId>org.apache.ambari</groupId>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<packaging>pom</packaging>
<modules>
<module>ambari-metrics-common</module>
@@ -124,8 +124,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>
@@ -184,8 +184,8 @@
<configuration>
<name>package-version</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>true</failIfNoMatch>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ba8c39c/ambari-project/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index e94bd69..04b668b 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<description>Apache Ambari Project POM</description>
<name>Apache Ambari Project POM</name>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ba8c39c/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 0b1870b..ae1b7b7 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
<artifactId>ambari-server</artifactId>
<packaging>${packagingFormat}</packaging>
<name>Ambari Server</name>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<description>Ambari Server</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,8 +69,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/3ba8c39c/ambari-shell/ambari-groovy-shell/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-shell/ambari-groovy-shell/pom.xml b/ambari-shell/ambari-groovy-shell/pom.xml
index 745cd87..5633796 100644
--- a/ambari-shell/ambari-groovy-shell/pom.xml
+++ b/ambari-shell/ambari-groovy-shell/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-shell</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../../ambari-shell</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
<artifactId>ambari-groovy-shell</artifactId>
<packaging>jar</packaging>
<name>Ambari Groovy Shell</name>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<description>Ambari Groovy Shell</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.ambari</groupId>
<artifactId>groovy-client</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ba8c39c/ambari-shell/ambari-python-shell/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-shell/ambari-python-shell/pom.xml b/ambari-shell/ambari-python-shell/pom.xml
index 66928d0..8eab67d 100644
--- a/ambari-shell/ambari-python-shell/pom.xml
+++ b/ambari-shell/ambari-python-shell/pom.xml
@@ -19,14 +19,14 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-shell</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../../ambari-shell</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-python-shell</artifactId>
<packaging>pom</packaging>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Python Shell</name>
<description>Ambari Python Shell</description>
<properties>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ba8c39c/ambari-shell/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-shell/pom.xml b/ambari-shell/pom.xml
index dc90261..ea128ee 100644
--- a/ambari-shell/pom.xml
+++ b/ambari-shell/pom.xml
@@ -21,14 +21,14 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-shell</artifactId>
<packaging>pom</packaging>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<name>Ambari Shell</name>
<description>Ambari Shell</description>
<modules>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ba8c39c/ambari-views/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-views/pom.xml b/ambari-views/pom.xml
index 6fe6004..d79ca58 100644
--- a/ambari-views/pom.xml
+++ b/ambari-views/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -28,7 +28,7 @@
<artifactId>ambari-views</artifactId>
<packaging>jar</packaging>
<name>Ambari Views</name>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<description>Ambari View interfaces.</description>
<dependencies>
<dependency>
@@ -75,8 +75,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/3ba8c39c/ambari-web/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml
index 6d5bd75..01675bd 100644
--- a/ambari-web/pom.xml
+++ b/ambari-web/pom.xml
@@ -20,14 +20,14 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-web</artifactId>
<packaging>pom</packaging>
<name>Ambari Web</name>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<description>Ambari Web</description>
<properties>
<ambari.dir>${project.parent.parent.basedir}</ambari.dir>
@@ -55,8 +55,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/3ba8c39c/docs/pom.xml
----------------------------------------------------------------------
diff --git a/docs/pom.xml b/docs/pom.xml
index 6ff75ea..4da88dc 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari</groupId>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<artifactId>ambari</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ba8c39c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 593cd67..93ab81f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<artifactId>ambari</artifactId>
<packaging>pom</packaging>
<name>Ambari Main</name>
- <version>2.1.0.0</version>
+ <version>2.1.2.1.0</version>
<description>Ambari</description>
<url>http://ambari.apache.org/</url>
<scm>
@@ -173,8 +173,8 @@
<configuration>
<name>package-version</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>true</failIfNoMatch>
</configuration>
</execution>
@@ -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>$6</replacement>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)((\.|-)(([0-9]+)|(SNAPSHOT)|(techwin)).*)?</regex>
+ <replacement>$7</replacement>
<failIfNoMatch>true</failIfNoMatch>
</configuration>
</execution>