diff options
| author | Juanjo Marron <jmarron@us.ibm.com> | 2016-07-21 17:59:00 -0700 |
|---|---|---|
| committer | Juanjo Marron <juanjo.marron@yahoo.com> | 2016-08-16 15:56:13 -0700 |
| commit | d032f63bfea2058b5d593c0f826e88132c8cd526 (patch) | |
| tree | 7b1e420d37d89adc656bc1367a675ab7020042f2 | |
| parent | 5dc6eb8d323708ff2010c7098f741c1509636484 (diff) | |
Add IBM regex and logic
33 files changed, 102 insertions, 108 deletions
diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml index c84a470fe6..90332d6434 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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</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]+)\.([0-9]+)(\.|-).*</regex> - <replacement>$1.$2.$3.$4</replacement> + <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)_(IBM)_([0-9]+).*</regex> + <replacement>$1.$2.$3</replacement> <failIfNoMatch>false</failIfNoMatch> </configuration> </execution> diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml index c46a7d587d..bb1feb556c 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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <name>Ambari Agent</name> <description>Ambari Agent</description> <properties> @@ -74,8 +74,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]+)_(IBM)_([0-9]+).*</regex> + <replacement>$1.$2.$3_$4</replacement> <failIfNoMatch>false</failIfNoMatch> </configuration> </execution> diff --git a/ambari-client/groovy-client/pom.xml b/ambari-client/groovy-client/pom.xml index 7b88519180..510eb5bf36 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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <name>Ambari Groovy Client</name> <description>Ambari Groovy client</description> <properties> diff --git a/ambari-client/pom.xml b/ambari-client/pom.xml index 95ed646826..09ee241c83 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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <name>Ambari Client</name> <description>Ambari client</description> <modules> diff --git a/ambari-client/python-client/pom.xml b/ambari-client/python-client/pom.xml index 933304b167..4578dd65da 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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <name>Ambari Python Client</name> <description>Ambari Python client</description> <properties> diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml b/ambari-metrics/ambari-metrics-assembly/pom.xml index 739019110b..01d68cab8f 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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-metrics-assembly</artifactId> <name>Ambari Metrics Assembly</name> <packaging>pom</packaging> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <description>Ambari Metrics Assembly</description> <properties> @@ -79,8 +79,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]+)_(IBM)_([0-9]+).*</regex> + <replacement>$1.$2.$3_$4</replacement> <failIfNoMatch>false</failIfNoMatch> </configuration> </execution> diff --git a/ambari-metrics/ambari-metrics-common/pom.xml b/ambari-metrics/ambari-metrics-common/pom.xml index a93100149b..b5bf58df72 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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-metrics-common</artifactId> @@ -105,4 +105,5 @@ <scope>test</scope> </dependency> </dependencies> + <version>2.4.0_IBM_000000-SNAPSHOT</version> </project> diff --git a/ambari-metrics/ambari-metrics-flume-sink/pom.xml b/ambari-metrics/ambari-metrics-flume-sink/pom.xml index dd27664243..51270ea74e 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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-metrics-flume-sink</artifactId> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-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]+)_(IBM)_([0-9]+).*</regex> + <replacement>$1.$2.$3_$4</replacement> <failIfNoMatch>false</failIfNoMatch> </configuration> </execution> diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml b/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml index 6bf0db29be..15911d9b8f 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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-metrics-hadoop-sink</artifactId> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-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]+)_(IBM)_([0-9]+).*</regex> + <replacement>$1.$2.$3_$4</replacement> <failIfNoMatch>false</failIfNoMatch> </configuration> </execution> diff --git a/ambari-metrics/ambari-metrics-host-monitoring/pom.xml b/ambari-metrics/ambari-metrics-host-monitoring/pom.xml index f2c970f7ff..1d8ab4b876 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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</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]+)\.([0-9]+)(\.|-).*</regex> - <replacement>$1.$2.$3.$4</replacement> + <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)_(IBM)_([0-9]+).*</regex> + <replacement>$1.$2.$3_$4</replacement> <failIfNoMatch>false</failIfNoMatch> </configuration> </execution> diff --git a/ambari-metrics/ambari-metrics-kafka-sink/pom.xml b/ambari-metrics/ambari-metrics-kafka-sink/pom.xml index b4d8b4400f..8a6336834a 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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-metrics-kafka-sink</artifactId> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-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]+)_(IBM)_([0-9]+).*</regex> + <replacement>$1.$2.$3_$4</replacement> <failIfNoMatch>false</failIfNoMatch> </configuration> </execution> diff --git a/ambari-metrics/ambari-metrics-storm-sink-legacy/pom.xml b/ambari-metrics/ambari-metrics-storm-sink-legacy/pom.xml index 4e2986e121..d7d1a48b24 100644 --- a/ambari-metrics/ambari-metrics-storm-sink-legacy/pom.xml +++ b/ambari-metrics/ambari-metrics-storm-sink-legacy/pom.xml @@ -22,11 +22,11 @@ limitations under the License. <parent> <artifactId>ambari-metrics</artifactId> <groupId>org.apache.ambari</groupId> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-metrics-storm-sink-legacy</artifactId> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <name>Ambari Metrics Storm Sink (Legacy)</name> <packaging>jar</packaging> diff --git a/ambari-metrics/ambari-metrics-storm-sink/pom.xml b/ambari-metrics/ambari-metrics-storm-sink/pom.xml index 267184a47b..edb6478e58 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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-metrics-storm-sink</artifactId> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-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]+)_(IBM)_([0-9]+).*</regex> + <replacement>$1.$2.$3_$4</replacement> <failIfNoMatch>false</failIfNoMatch> </configuration> </execution> diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml b/ambari-metrics/ambari-metrics-timelineservice/pom.xml index 4444cceef3..c302990176 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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-metrics-timelineservice</artifactId> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</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]+)\.([0-9]+)(\.|-).*</regex> - <replacement>$1.$2.$3.$4</replacement> + <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)_(IBM)_([0-9]+).*</regex> + <replacement>$1.$2.$3_$4</replacement> <failIfNoMatch>false</failIfNoMatch> </configuration> </execution> diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml index 0c360f94e0..7a2dab7bcf 100644 --- a/ambari-metrics/pom.xml +++ b/ambari-metrics/pom.xml @@ -18,7 +18,7 @@ <groupId>org.apache.ambari</groupId> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-metrics</artifactId> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>ambari-metrics-common</module> @@ -139,8 +139,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]+)_(IBM)_([0-9]+).*</regex> + <replacement>$1.$2.$3_$4</replacement> <failIfNoMatch>false</failIfNoMatch> </configuration> </execution> @@ -206,8 +206,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]+)_(IBM)_([0-9]+).*</regex> + <replacement>$1.$2.$3_$4</replacement> <failIfNoMatch>true</failIfNoMatch> </configuration> </execution> @@ -219,10 +219,8 @@ <configuration> <name>package-release</name> <value>${project.version}</value> - <regex> - ^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)((([a-zA-Z]+)?([0-9]+))|(SNAPSHOT)).* - </regex> - <replacement>$7</replacement> + <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)_(IBM)_(([0-9]+)|(([0-9]+)(-SNAPSHOT))).*</regex> + <replacement>$5</replacement> <failIfNoMatch>true</failIfNoMatch> </configuration> </execution> diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml index 64e0ff500f..4c300eea6a 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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> </parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-project</artifactId> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <description>Apache Ambari Project POM</description> <name>Apache Ambari Project POM</name> <packaging>pom</packaging> diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 84f66ac707..649e57fd9a 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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</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]+)\.([0-9]+)(\.|-).*</regex> - <replacement>$1.$2.$3.$4</replacement> + <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)_(IBM)_([0-9]+).*</regex> + <replacement>$1.$2.$3_$4</replacement> <failIfNoMatch>false</failIfNoMatch> </configuration> </execution> diff --git a/ambari-server/src/main/java/org/apache/ambari/server/utils/VersionUtils.java b/ambari-server/src/main/java/org/apache/ambari/server/utils/VersionUtils.java index d3d859258d..d0067db24e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/utils/VersionUtils.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/VersionUtils.java @@ -76,12 +76,11 @@ public class VersionUtils { throw new IllegalArgumentException("maxLengthToCompare cannot be less than 0"); } - if(BootStrapImpl.DEV_VERSION.equals(version1.trim())) { - return 0; - } - - String[] version1Parts = version1.split("\\."); - String[] version2Parts = version2.split("\\."); + if(BootStrapImpl.DEV_VERSION.equals(version1.trim())) return 0; + + String pattern = "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*"; + String[] version1Parts = version1.replaceAll(pattern, "$1.$2.$3").split("\\."); + String[] version2Parts = version2.replaceAll(pattern, "$1.$2.$3").split("\\."); int length = Math.max(version1Parts.length, version2Parts.length); length = maxLengthToCompare == 0 || maxLengthToCompare > length ? length : maxLengthToCompare; diff --git a/ambari-shell/ambari-groovy-shell/pom.xml b/ambari-shell/ambari-groovy-shell/pom.xml index 276ff42b0a..f4f89020a3 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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <description>Ambari Groovy Shell</description> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> diff --git a/ambari-shell/ambari-python-shell/pom.xml b/ambari-shell/ambari-python-shell/pom.xml index 192bc4dec0..3b9d4dafcd 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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <name>Ambari Python Shell</name> <description>Ambari Python Shell</description> <properties> diff --git a/ambari-shell/pom.xml b/ambari-shell/pom.xml index 387033c57d..99b82bd7a3 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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <name>Ambari Shell</name> <description>Ambari Shell</description> <modules> diff --git a/ambari-views/pom.xml b/ambari-views/pom.xml index ef730733fe..4d2a89aeeb 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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</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]+)\.([0-9]+)(\.|-).*</regex> - <replacement>$1.$2.$3.$4</replacement> + <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)_(IBM)_([0-9]+).*</regex> + <replacement>$1.$2.$3_$4</replacement> <failIfNoMatch>false</failIfNoMatch> </configuration> </execution> diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml index ca75fe3f87..99a3a92a94 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.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <relativePath>../ambari-project</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-web</artifactId> <packaging>pom</packaging> <name>Ambari Web</name> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <description>Ambari Web</description> <properties> <ambari.dir>${project.parent.parent.basedir}</ambari.dir> @@ -55,9 +55,9 @@ </goals> <configuration> <name>ambariVersion</name> - <value>${project.version}</value> - <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex> - <replacement>$1.$2.$3.$4</replacement> + <value>${project.version}</value> + <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)_(IBM)_([0-9]+).*</regex> + <replacement>$1.$2.$3_$4</replacement> <failIfNoMatch>false</failIfNoMatch> </configuration> </execution> diff --git a/contrib/views/capacity-scheduler/pom.xml b/contrib/views/capacity-scheduler/pom.xml index 5559600818..9e6767e546 100644 --- a/contrib/views/capacity-scheduler/pom.xml +++ b/contrib/views/capacity-scheduler/pom.xml @@ -19,13 +19,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>capacity-scheduler</artifactId> - <version>1.0.0.0-SNAPSHOT</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <name>Capacity Scheduler</name> <parent> <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>ambari-contrib-views</artifactId> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> </parent> <dependencies> diff --git a/contrib/views/files/pom.xml b/contrib/views/files/pom.xml index 67851a5f5a..b1a6993598 100644 --- a/contrib/views/files/pom.xml +++ b/contrib/views/files/pom.xml @@ -19,13 +19,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>files</artifactId> - <version>1.0.0.0-SNAPSHOT</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <name>Files</name> <parent> <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>ambari-contrib-views</artifactId> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> </parent> <dependencies> diff --git a/contrib/views/hive/pom.xml b/contrib/views/hive/pom.xml index a429d482e8..6d804fe0f1 100644 --- a/contrib/views/hive/pom.xml +++ b/contrib/views/hive/pom.xml @@ -19,13 +19,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>hive</artifactId> - <version>1.0.0.0-SNAPSHOT</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <name>Hive</name> <parent> <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>ambari-contrib-views</artifactId> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> </parent> <dependencies> diff --git a/contrib/views/jobs/pom.xml b/contrib/views/jobs/pom.xml index 6322375d27..2a4ed414b5 100644 --- a/contrib/views/jobs/pom.xml +++ b/contrib/views/jobs/pom.xml @@ -19,14 +19,14 @@ <parent> <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>ambari-contrib-views</artifactId> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>jobs</artifactId> <packaging>jar</packaging> <name>Jobs</name> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <description>Jobs View</description> <properties> <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir> diff --git a/contrib/views/pig/pom.xml b/contrib/views/pig/pom.xml index 4082cc09d4..fd9fb1596f 100644 --- a/contrib/views/pig/pom.xml +++ b/contrib/views/pig/pom.xml @@ -19,13 +19,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>pig</artifactId> - <version>1.0.0.0-SNAPSHOT</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <name>Pig</name> <parent> <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>ambari-contrib-views</artifactId> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> </parent> <dependencies> diff --git a/contrib/views/pom.xml b/contrib/views/pom.xml index f89af2c3b6..572eec0aa0 100644 --- a/contrib/views/pom.xml +++ b/contrib/views/pom.xml @@ -19,14 +19,14 @@ <parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-project</artifactId> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <relativePath>../../ambari-project</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>ambari-contrib-views</artifactId> <packaging>pom</packaging> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <name>Ambari Contrib Views</name> <properties> <ambari.version>2.4.0.0.0</ambari.version> diff --git a/contrib/views/slider/pom.xml b/contrib/views/slider/pom.xml index ec47fdce72..b7e7c92314 100644 --- a/contrib/views/slider/pom.xml +++ b/contrib/views/slider/pom.xml @@ -13,13 +13,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>slider</artifactId> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <name>Slider</name> <parent> <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>ambari-contrib-views</artifactId> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> </parent> <dependencies> diff --git a/contrib/views/storm/pom.xml b/contrib/views/storm/pom.xml index d3c369bfcb..c4374f10c2 100644 --- a/contrib/views/storm/pom.xml +++ b/contrib/views/storm/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>ambari-contrib-views</artifactId> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> </parent> <properties> <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir> @@ -28,7 +28,7 @@ <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>storm-view</artifactId> <name>Storm_Monitoring</name> - <version>0.1.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <description>Storm Monitoring View</description> <build> diff --git a/contrib/views/utils/pom.xml b/contrib/views/utils/pom.xml index b3ae02b017..228e450f30 100644 --- a/contrib/views/utils/pom.xml +++ b/contrib/views/utils/pom.xml @@ -19,13 +19,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>ambari-views-utils</artifactId> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <name>Ambari View Utils</name> <parent> <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>ambari-contrib-views</artifactId> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> </parent> <dependencies> @@ -21,13 +21,9 @@ <artifactId>ambari</artifactId> <packaging>pom</packaging> <name>Ambari Main</name> - <version>2.4.0.0.0</version> + <version>2.4.0_IBM_000000-SNAPSHOT</version> <description>Ambari</description> <url>http://ambari.apache.org/</url> - <scm> - <url>https://github.com/apache/ambari</url> - <connection>https://git-wip-us.apache.org/repos/asf/ambari.git</connection> - </scm> <licenses> <license> <name>The Apache Software License, Version 2.0</name> @@ -174,8 +170,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]+)_(IBM)_([0-9]+).*</regex> + <replacement>$1.$2.$3_$4</replacement> <failIfNoMatch>true</failIfNoMatch> </configuration> </execution> @@ -187,8 +183,8 @@ <configuration> <name>package-release</name> <value>${project.version}</value> - <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)((\.|-)(([0-9]+)|(SNAPSHOT)|(techwin)).*)?</regex> - <replacement>$7</replacement> + <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)_(IBM)_(([0-9]+)|(([0-9]+)(-SNAPSHOT))).*</regex> + <replacement>$5</replacement> <failIfNoMatch>true</failIfNoMatch> </configuration> </execution> |