Revert "Add IBM regex and logic"

This reverts commit d032f63bfea2058b5d593c0f826e88132c8cd526.

ambari-admin/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.4.0_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.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.4.0_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.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]+)_(IBM)_([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>

ambari-agent/pom.xml

@@ -19,14 +19,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.4.0_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.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.4.0_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.0</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]+)_(IBM)_([0-9]+).*</regex>
-              <replacement>$1.$2.$3_$4</replacement>
+              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+              <replacement>$1.$2.$3.$4</replacement>
               <failIfNoMatch>false</failIfNoMatch>
             </configuration>
           </execution>

ambari-client/groovy-client/pom.xml

@@ -12,14 +12,14 @@
   <parent>
     <artifactId>ambari-client</artifactId>
     <groupId>org.apache.ambari</groupId>
-    <version>2.4.0_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.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.4.0_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.0</version>
   <name>Ambari Groovy Client</name>
   <description>Ambari Groovy client</description>
   <properties>

ambari-client/pom.xml

@@ -20,14 +20,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.4.0_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.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.4.0_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.0</version>
   <name>Ambari Client</name>
   <description>Ambari client</description>
   <modules>

ambari-client/python-client/pom.xml

@@ -19,14 +19,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-client</artifactId>
-    <version>2.4.0_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.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.4.0_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.0</version>
   <name>Ambari Python Client</name>
   <description>Ambari Python client</description>
   <properties>

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_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-metrics-assembly</artifactId>
   <name>Ambari Metrics Assembly</name>
   <packaging>pom</packaging>
-  <version>2.4.0_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.0</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]+)_(IBM)_([0-9]+).*</regex>
-              <replacement>$1.$2.$3_$4</replacement>
+              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+              <replacement>$1.$2.$3.$4</replacement>
               <failIfNoMatch>false</failIfNoMatch>
             </configuration>
           </execution>

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_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-metrics-common</artifactId>
@@ -105,5 +105,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <version>2.4.0_IBM_000000-SNAPSHOT</version>
 </project>

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_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-metrics-flume-sink</artifactId>
-  <version>2.4.0_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.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]+)_(IBM)_([0-9]+).*</regex>
-              <replacement>$1.$2.$3_$4</replacement>
+              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+              <replacement>$1.$2.$3.$4</replacement>
               <failIfNoMatch>false</failIfNoMatch>
             </configuration>
           </execution>

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_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-metrics-hadoop-sink</artifactId>
-  <version>2.4.0_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.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]+)_(IBM)_([0-9]+).*</regex>
-              <replacement>$1.$2.$3_$4</replacement>
+              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+              <replacement>$1.$2.$3.$4</replacement>
               <failIfNoMatch>false</failIfNoMatch>
             </configuration>
           </execution>

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_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>pom</packaging>
-  <version>2.4.0_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.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]+)_(IBM)_([0-9]+).*</regex>
-              <replacement>$1.$2.$3_$4</replacement>
+              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+              <replacement>$1.$2.$3.$4</replacement>
               <failIfNoMatch>false</failIfNoMatch>
             </configuration>
           </execution>

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_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-metrics-kafka-sink</artifactId>
-  <version>2.4.0_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.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]+)_(IBM)_([0-9]+).*</regex>
-              <replacement>$1.$2.$3_$4</replacement>
+              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+              <replacement>$1.$2.$3.$4</replacement>
               <failIfNoMatch>false</failIfNoMatch>
             </configuration>
           </execution>

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_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-metrics-storm-sink-legacy</artifactId>
-  <version>2.4.0_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.0</version>
   <name>Ambari Metrics Storm Sink (Legacy)</name>
   <packaging>jar</packaging>
 

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_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-metrics-storm-sink</artifactId>
-  <version>2.4.0_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.0</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]+)_(IBM)_([0-9]+).*</regex>
-              <replacement>$1.$2.$3_$4</replacement>
+              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+              <replacement>$1.$2.$3.$4</replacement>
               <failIfNoMatch>false</failIfNoMatch>
             </configuration>
           </execution>

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_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-metrics-timelineservice</artifactId>
-  <version>2.4.0_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.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]+)_(IBM)_([0-9]+).*</regex>
-              <replacement>$1.$2.$3_$4</replacement>
+              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+              <replacement>$1.$2.$3.$4</replacement>
               <failIfNoMatch>false</failIfNoMatch>
             </configuration>
           </execution>

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_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.0</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]+)_(IBM)_([0-9]+).*</regex>
-              <replacement>$1.$2.$3_$4</replacement>
+              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([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]+)_(IBM)_([0-9]+).*</regex>
-              <replacement>$1.$2.$3_$4</replacement>
+              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+              <replacement>$1.$2.$3.$4</replacement>
               <failIfNoMatch>true</failIfNoMatch>
             </configuration>
           </execution>
@@ -219,8 +219,10 @@
             <configuration>
               <name>package-release</name>
               <value>${project.version}</value>
-              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)_(IBM)_(([0-9]+)|(([0-9]+)(-SNAPSHOT))).*</regex>
-              <replacement>$5</replacement>
+              <regex>
+                ^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)((([a-zA-Z]+)?([0-9]+))|(SNAPSHOT)).*
+              </regex>
+              <replacement>$7</replacement>
               <failIfNoMatch>true</failIfNoMatch>
             </configuration>
           </execution>

ambari-project/pom.xml

@@ -18,11 +18,11 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari</artifactId>
-    <version>2.4.0_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.0</version>
   </parent>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-project</artifactId>
-  <version>2.4.0_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.0</version>
   <description>Apache Ambari Project POM</description>
   <name>Apache Ambari Project POM</name>
   <packaging>pom</packaging>

ambari-server/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.4.0_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.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.4.0_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.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]+)_(IBM)_([0-9]+).*</regex>
-              <replacement>$1.$2.$3_$4</replacement>
+              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+              <replacement>$1.$2.$3.$4</replacement>
               <failIfNoMatch>false</failIfNoMatch>
             </configuration>
           </execution>

ambari-server/src/main/java/org/apache/ambari/server/utils/VersionUtils.java

@@ -76,11 +76,12 @@ public class VersionUtils {
       throw new IllegalArgumentException("maxLengthToCompare cannot be less than 0");
     }
 
-    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("\\.");
+    if(BootStrapImpl.DEV_VERSION.equals(version1.trim())) {
+      return 0;
+    }
+
+    String[] version1Parts = version1.split("\\.");
+    String[] version2Parts = version2.split("\\.");
 
     int length = Math.max(version1Parts.length, version2Parts.length);
     length = maxLengthToCompare == 0 || maxLengthToCompare > length ? length : maxLengthToCompare;

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_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.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.4.0_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.0</version>
   <description>Ambari Groovy Shell</description>
    <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.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.4.0_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.0</version>
   <name>Ambari Python Shell</name>
   <description>Ambari Python Shell</description>
   <properties>

ambari-shell/pom.xml

@@ -21,14 +21,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.4.0_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.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.4.0_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.0</version>
   <name>Ambari Shell</name>
   <description>Ambari Shell</description>
   <modules>

ambari-views/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.ambari</groupId>
         <artifactId>ambari-project</artifactId>
-        <version>2.4.0_IBM_000000-SNAPSHOT</version>
+        <version>2.4.0.0.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.4.0_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.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]+)_(IBM)_([0-9]+).*</regex>
-                            <replacement>$1.$2.$3_$4</replacement>
+                            <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+                            <replacement>$1.$2.$3.$4</replacement>
                             <failIfNoMatch>false</failIfNoMatch>
                         </configuration>
                     </execution>

ambari-web/pom.xml

@@ -20,14 +20,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.4.0_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.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.4.0_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.0</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]+)_(IBM)_([0-9]+).*</regex>
-                <replacement>$1.$2.$3_$4</replacement>
+              <value>${project.version}</value>
+              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+              <replacement>$1.$2.$3.$4</replacement>
               <failIfNoMatch>false</failIfNoMatch>
             </configuration>
           </execution>

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>2.4.0_IBM_000000-SNAPSHOT</version>
+    <version>1.0.0.0-SNAPSHOT</version>
     <name>Capacity Scheduler</name>
 
     <parent>
         <groupId>org.apache.ambari.contrib.views</groupId>
         <artifactId>ambari-contrib-views</artifactId>
-        <version>2.4.0_IBM_000000-SNAPSHOT</version>
+        <version>2.4.0.0.0</version>
     </parent>
 
     <dependencies>

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>2.4.0_IBM_000000-SNAPSHOT</version>
+  <version>1.0.0.0-SNAPSHOT</version>
   <name>Files</name>
 
   <parent>
     <groupId>org.apache.ambari.contrib.views</groupId>
     <artifactId>ambari-contrib-views</artifactId>
-    <version>2.4.0_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.0</version>
   </parent>
 
   <dependencies>

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>2.4.0_IBM_000000-SNAPSHOT</version>
+  <version>1.0.0.0-SNAPSHOT</version>
   <name>Hive</name>
 
   <parent>
     <groupId>org.apache.ambari.contrib.views</groupId>
     <artifactId>ambari-contrib-views</artifactId>
-    <version>2.4.0_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.0</version>
   </parent>
 
   <dependencies>

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_IBM_000000-SNAPSHOT</version>
+        <version>2.4.0.0.0</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_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.0</version>
     <description>Jobs View</description>
     <properties>
       <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>

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>2.4.0_IBM_000000-SNAPSHOT</version>
+  <version>1.0.0.0-SNAPSHOT</version>
   <name>Pig</name>
 
   <parent>
     <groupId>org.apache.ambari.contrib.views</groupId>
     <artifactId>ambari-contrib-views</artifactId>
-    <version>2.4.0_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.0</version>
   </parent>
 
   <dependencies>

contrib/views/pom.xml

@@ -19,14 +19,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.4.0_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.0</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_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.0</version>
   <name>Ambari Contrib Views</name>
   <properties>
     <ambari.version>2.4.0.0.0</ambari.version>

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_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.0</version>
   <name>Slider</name>
 
   <parent>
     <groupId>org.apache.ambari.contrib.views</groupId>
     <artifactId>ambari-contrib-views</artifactId>
-    <version>2.4.0_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.0</version>
   </parent>
 
   <dependencies>

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_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.0</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>2.4.0_IBM_000000-SNAPSHOT</version>
+  <version>0.1.0.0</version>
   <description>Storm Monitoring View</description>
 
   <build>

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_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.0</version>
   <name>Ambari View Utils</name>
 
   <parent>
     <groupId>org.apache.ambari.contrib.views</groupId>
     <artifactId>ambari-contrib-views</artifactId>
-    <version>2.4.0_IBM_000000-SNAPSHOT</version>
+    <version>2.4.0.0.0</version>
   </parent>
 
   <dependencies>

pom.xml

@@ -21,9 +21,13 @@
   <artifactId>ambari</artifactId>
   <packaging>pom</packaging>
   <name>Ambari Main</name>
-  <version>2.4.0_IBM_000000-SNAPSHOT</version>
+  <version>2.4.0.0.0</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>
@@ -170,8 +174,8 @@
             <configuration>
               <name>package-version</name>
               <value>${project.version}</value>
-              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)_(IBM)_([0-9]+).*</regex>
-              <replacement>$1.$2.$3_$4</replacement>
+              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)((\.|-).*)?</regex>
+              <replacement>$1.$2.$3.$4</replacement>
               <failIfNoMatch>true</failIfNoMatch>
             </configuration>
           </execution>
@@ -183,8 +187,8 @@
             <configuration>
               <name>package-release</name>
               <value>${project.version}</value>
-              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)_(IBM)_(([0-9]+)|(([0-9]+)(-SNAPSHOT))).*</regex>
-              <replacement>$5</replacement>
+              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)((\.|-)(([0-9]+)|(SNAPSHOT)|(techwin)).*)?</regex>
+              <replacement>$7</replacement>
               <failIfNoMatch>true</failIfNoMatch>
             </configuration>
           </execution>