This is an automated email from the ASF dual-hosted git repository.
wuzhiguo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git
The following commit(s) were added to refs/heads/master by this push:
new b2c64cc AMBARI-25859: Correct Ambari Metrics version parsing logic
(#98)
b2c64cc is described below
commit b2c64cc74a310dae08c8c49cc05d29e57bb0e461
Author: Zhiguo Wu <wuzhi...@apache.org>
AuthorDate: Thu Feb 23 10:27:40 2023 +0800
AMBARI-25859: Correct Ambari Metrics version parsing logic (#98)
---
ambari-metrics-assembly/pom.xml | 8 ++++----
ambari-metrics-common/pom.xml | 2 +-
ambari-metrics-flume-sink/pom.xml | 8 ++++----
ambari-metrics-grafana/pom.xml | 8 ++++----
ambari-metrics-hadoop-sink/pom.xml | 8 ++++----
ambari-metrics-host-aggregator/pom.xml | 4 ++--
ambari-metrics-host-monitoring/pom.xml | 8 ++++----
ambari-metrics-kafka-sink/pom.xml | 8 ++++----
ambari-metrics-storm-sink/pom.xml | 8 ++++----
ambari-metrics-timelineservice/pom.xml | 8 ++++----
pom.xml | 14 +++++++-------
11 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/ambari-metrics-assembly/pom.xml b/ambari-metrics-assembly/pom.xml
index e6db31c..34d318f 100644
--- a/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics-assembly/pom.xml
@@ -23,13 +23,13 @@
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.0.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-assembly</artifactId>
<name>Ambari Metrics Assembly</name>
<packaging>pom</packaging>
- <version>2.0.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<description>Ambari Metrics Assembly</description>
<properties>
@@ -78,8 +78,8 @@
<configuration>
<name>ambariVersion</name>
<value>${project.version}</value>
- <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
- <replacement>$1.$2.$3.$4</replacement>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+ <replacement>$1.$2.$3</replacement>
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
diff --git a/ambari-metrics-common/pom.xml b/ambari-metrics-common/pom.xml
index f5cf891..754be73 100644
--- a/ambari-metrics-common/pom.xml
+++ b/ambari-metrics-common/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.0.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-common</artifactId>
diff --git a/ambari-metrics-flume-sink/pom.xml
b/ambari-metrics-flume-sink/pom.xml
index a6b81bb..a358691 100644
--- a/ambari-metrics-flume-sink/pom.xml
+++ b/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.0.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-flume-sink</artifactId>
- <version>2.0.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</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]+)\.([0-9]+)(\.|-).*</regex>
- <replacement>$1.$2.$3.$4</replacement>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+ <replacement>$1.$2.$3</replacement>
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
diff --git a/ambari-metrics-grafana/pom.xml b/ambari-metrics-grafana/pom.xml
index 927868f..3f1bd50 100644
--- a/ambari-metrics-grafana/pom.xml
+++ b/ambari-metrics-grafana/pom.xml
@@ -21,14 +21,14 @@
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.0.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-grafana</artifactId>
<name>Ambari Metrics Grafana</name>
<packaging>pom</packaging>
- <version>2.0.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<description>Ambari Metrics Grafana</description>
<build>
@@ -73,8 +73,8 @@
<configuration>
<name>ambariVersion</name>
<value>${project.version}</value>
- <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
- <replacement>$1.$2.$3.$4</replacement>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+ <replacement>$1.$2.$3</replacement>
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
diff --git a/ambari-metrics-hadoop-sink/pom.xml
b/ambari-metrics-hadoop-sink/pom.xml
index 0811770..43cd0b7 100644
--- a/ambari-metrics-hadoop-sink/pom.xml
+++ b/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.0.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-hadoop-sink</artifactId>
- <version>2.0.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</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]+)\.([0-9]+)(\.|-).*</regex>
- <replacement>$1.$2.$3.$4</replacement>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+ <replacement>$1.$2.$3</replacement>
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
diff --git a/ambari-metrics-host-aggregator/pom.xml
b/ambari-metrics-host-aggregator/pom.xml
index c61aafd..122b64b 100644
--- a/ambari-metrics-host-aggregator/pom.xml
+++ b/ambari-metrics-host-aggregator/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.0.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-metrics-common</artifactId>
- <version>2.0.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/ambari-metrics-host-monitoring/pom.xml
b/ambari-metrics-host-monitoring/pom.xml
index 56cac8f..be27cae 100644
--- a/ambari-metrics-host-monitoring/pom.xml
+++ b/ambari-metrics-host-monitoring/pom.xml
@@ -22,11 +22,11 @@
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.0.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <version>2.0.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<artifactId>ambari-metrics-host-monitoring</artifactId>
<name>Ambari Metrics Monitor</name>
<properties>
@@ -71,8 +71,8 @@
<configuration>
<name>ambariVersion</name>
<value>${project.version}</value>
- <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
- <replacement>$1.$2.$3.$4</replacement>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+ <replacement>$1.$2.$3</replacement>
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
diff --git a/ambari-metrics-kafka-sink/pom.xml
b/ambari-metrics-kafka-sink/pom.xml
index a33acff..4c7b182 100644
--- a/ambari-metrics-kafka-sink/pom.xml
+++ b/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.0.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-kafka-sink</artifactId>
- <version>2.0.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</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]+)\.([0-9]+)(\.|-).*</regex>
- <replacement>$1.$2.$3.$4</replacement>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+ <replacement>$1.$2.$3</replacement>
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
diff --git a/ambari-metrics-storm-sink/pom.xml
b/ambari-metrics-storm-sink/pom.xml
index 5687693..6422e62 100644
--- a/ambari-metrics-storm-sink/pom.xml
+++ b/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.0.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-storm-sink</artifactId>
- <version>2.0.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>Ambari Metrics Storm Sink</name>
<packaging>jar</packaging>
@@ -60,8 +60,8 @@ limitations under the License.
<configuration>
<name>ambariVersion</name>
<value>${project.version}</value>
- <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
- <replacement>$1.$2.$3.$4</replacement>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+ <replacement>$1.$2.$3</replacement>
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
diff --git a/ambari-metrics-timelineservice/pom.xml
b/ambari-metrics-timelineservice/pom.xml
index f221b21..877587c 100644
--- a/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics-timelineservice/pom.xml
@@ -22,11 +22,11 @@
<parent>
<artifactId>ambari-metrics</artifactId>
<groupId>org.apache.ambari</groupId>
- <version>2.0.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics-timelineservice</artifactId>
- <version>2.0.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>Ambari Metrics Collector</name>
<packaging>jar</packaging>
@@ -58,8 +58,8 @@
<configuration>
<name>ambariVersion</name>
<value>${project.version}</value>
- <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
- <replacement>$1.$2.$3.$4</replacement>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+ <replacement>$1.$2.$3</replacement>
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
diff --git a/pom.xml b/pom.xml
index 63830c2..ab440cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<groupId>org.apache.ambari</groupId>
<modelVersion>4.0.0</modelVersion>
<artifactId>ambari-metrics</artifactId>
- <version>2.0.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>ambari-metrics-common</module>
@@ -167,8 +167,8 @@
<configuration>
<name>ambariVersion</name>
<value>${project.version}</value>
- <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
- <replacement>$1.$2.$3.$4</replacement>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+ <replacement>$1.$2.$3</replacement>
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
@@ -180,8 +180,8 @@
<configuration>
<name>package-version</name>
<value>${project.version}</value>
- <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
- <replacement>$1.$2.$3.$4</replacement>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+ <replacement>$1.$2.$3</replacement>
<failIfNoMatch>true</failIfNoMatch>
</configuration>
</execution>
@@ -194,9 +194,9 @@
<name>package-release</name>
<value>${project.version}</value>
<regex>
-
^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)((\.|-)(([0-9]+)|(SNAPSHOT)|(techwin)).*)?
+
^([0-9]+)\.([0-9]+)\.([0-9]+)((\.|-)(([0-9]+)|(SNAPSHOT)|(techwin)).*)?
</regex>
- <replacement>$7</replacement>
+ <replacement>$6</replacement>
<failIfNoMatch>true</failIfNoMatch>
</configuration>
</execution>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@ambari.apache.org
For additional commands, e-mail: commits-h...@ambari.apache.org
