[2/2] ambari git commit: AMBARI-13403. Ambari unable to build rpms with 4 digit versions (aonishuk)

2015-10-13 Thread aonishuk 
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 
Authored: Tue Oct 13 17:51:14 2015 +0300
Committer: Andrew Onishuk 
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 @@
   
 org.apache.ambari
 ambari-project
-2.1.0.0
+2.1.2.1.0
 ../ambari-project
   
   4.0.0
@@ -27,7 +27,7 @@
   ambari-admin
   jar
   Ambari Admin View
-  2.1.0.0
+  2.1.2.1.0
   Admin control panel
   
 
@@ -51,8 +51,8 @@
 
   ambariVersion
   ${project.version}
-  ^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*
-  $1.$2.$3
+  ^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*
+  $1.$2.$3.$4
   false
 
   

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 @@
   
 org.apache.ambari
 ambari-project
-2.1.0.0
+2.1.2.1.0
 ../ambari-project
   
   4.0.0
   org.apache.ambari
   ambari-agent
   pom
-  2.1.0.0
+  2.1.2.1.0
   Ambari Agent
   Ambari Agent
   
@@ -77,8 +77,8 @@
 
   ambariVersion
   ${project.version}
-  ^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*
-  $1.$2.$3
+  ^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*
+  $1.$2.$3.$4
   false
 
   

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 @@
   
 ambari-client
 org.apache.ambari
-2.1.0.0
+2.1.2.1.0
 ../../ambari-client/
   
   4.0.0
   org.apache.ambari
   groovy-client
   jar
-  2.1.0.0
+  2.1.2.1.0
   Ambari Groovy Client
   Ambari Groovy client
   

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

[1/2] ambari git commit: AMBARI-13403. Ambari unable to build rpms with 4 digit versions (aonishuk)

2015-10-13 Thread 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 
Authored: Tue Oct 13 17:51:12 2015 +0300
Committer: Andrew Onishuk 
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 @@
   
 org.apache.ambari
 ambari-project
-2.1.0.0
+2.1.2.1.0
 ../ambari-project
   
   4.0.0
@@ -27,7 +27,7 @@
   ambari-admin
   jar
   Ambari Admin View
-  2.1.0.0
+  2.1.2.1.0
   Admin control panel
   
 
@@ -51,8 +51,8 @@
 
   ambariVersion
   ${project.version}
-  ^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*
-  $1.$2.$3
+  ^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*
+  $1.$2.$3.$4
   false
 
   

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 @@
   
 org.apache.ambari
 ambari-project
-2.1.0.0
+2.1.2.1.0
 ../ambari-project
   
   4.0.0
   org.apache.ambari
   ambari-agent
   pom
-  2.1.0.0
+  2.1.2.1.0
   Ambari Agent
   Ambari Agent
   
@@ -77,8 +77,8 @@
 
   ambariVersion
   ${project.version}
-  ^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*
-  $1.$2.$3
+  ^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*
+  $1.$2.$3.$4
   false
 
   

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 @@
   
 ambari-client
 org.apache.ambari
-2.1.0.0
+2.1.2.1.0
 ../../ambari-client/
   
   4.0.0
   org.apache.ambari
   groovy-client
   jar
-  2.1.0.0
+  2.1.2.1.0
   Ambari Groovy Client
   Ambari Groovy client
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/54823edf/ambari-client/pom.xml
--
diff --git

ambari git commit: AMBARI-13403. Ambari unable to build rpms with 4 digit versions (aonishuk)

2015-10-13 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1.2 febfc413f -> 099096246


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/09909624
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/09909624
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/09909624

Branch: refs/heads/branch-2.1.2
Commit: 09909624689e36125134dd3026490440ff8f17ec
Parents: febfc41
Author: Andrew Onishuk 
Authored: Tue Oct 13 18:38:37 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Oct 13 18:38:37 2015 +0300

--
 ambari-admin/pom.xml  | 4 ++--
 ambari-agent/pom.xml  | 4 ++--
 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| 4 ++--
 ambari-metrics/ambari-metrics-common/pom.xml  | 2 +-
 ambari-metrics/ambari-metrics-flume-sink/pom.xml  | 4 ++--
 ambari-metrics/ambari-metrics-hadoop-sink/pom.xml | 4 ++--
 ambari-metrics/ambari-metrics-host-monitoring/pom.xml | 4 ++--
 ambari-metrics/ambari-metrics-kafka-sink/pom.xml  | 4 ++--
 ambari-metrics/ambari-metrics-storm-sink/pom.xml  | 4 ++--
 ambari-metrics/ambari-metrics-timelineservice/pom.xml | 6 +++---
 ambari-metrics/pom.xml| 2 +-
 ambari-project/pom.xml| 4 ++--
 ambari-server/pom.xml | 4 ++--
 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  | 4 ++--
 ambari-web/pom.xml| 4 ++--
 contrib/views/capacity-scheduler/pom.xml  | 2 +-
 contrib/views/files/pom.xml   | 2 +-
 contrib/views/hive/pom.xml| 2 +-
 contrib/views/jobs/pom.xml| 4 ++--
 contrib/views/pig/pom.xml | 2 +-
 contrib/views/pom.xml | 4 ++--
 contrib/views/slider/pom.xml  | 4 ++--
 contrib/views/storm/pom.xml   | 2 +-
 contrib/views/tez/pom.xml | 2 +-
 contrib/views/utils/pom.xml   | 2 +-
 pom.xml   | 2 +-
 32 files changed, 56 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/09909624/ambari-admin/pom.xml
--
diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml
index 43764b8..c80549c 100644
--- a/ambari-admin/pom.xml
+++ b/ambari-admin/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.ambari
 ambari-project
-2.1.2.1.0
+2.1.0.0.0
 ../ambari-project
   
   4.0.0
@@ -27,7 +27,7 @@
   ambari-admin
   jar
   Ambari Admin View
-  2.1.2.1.0
+  2.1.0.0.0
   Admin control panel
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/09909624/ambari-agent/pom.xml
--
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 83852cd..38f436e 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -19,14 +19,14 @@
   
 org.apache.ambari
 ambari-project
-2.1.2.1.0
+2.1.0.0.0
 ../ambari-project
   
   4.0.0
   org.apache.ambari
   ambari-agent
   pom
-  2.1.2.1.0
+  2.1.0.0.0
   Ambari Agent
   Ambari Agent
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/09909624/ambari-client/groovy-client/pom.xml
--
diff --git a/ambari-client/groovy-client/pom.xml 
b/ambari-client/groovy-client/pom.xml
index 1568c94..3dbc78e 100644
--- a/ambari-client/groovy-client/pom.xml
+++ b/ambari-client/groovy-client/pom.xml
@@ -12,14 +12,14 @@
   
 ambari-client
 org.apache.ambari
-2.1.2.1.0
+2.1.0.0.0
 ../../ambari-client/
   
   4.0.0
   org.apache.ambari
   groovy-client
   jar
-  2.1.2.1.0
+  2.1.0.0.0
   Ambari Groovy Client
   Ambari Groovy client
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/09909624/ambari-client/pom.xml
--
diff --git a/ambari-client/pom.xml b/ambari-client/pom.xml
index 44b5948..2f8f3fc 100755
--- a/ambari-client/pom.xml
+++ b/ambari-client/pom.xml
@@ -20,14 +20,14 @@
   
 org.apache.ambari

ambari git commit: AMBARI-13403. Ambari unable to build rpms with 4 digit versions (aonishuk)

2015-10-13 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 3ba8c39c5 -> 2443d6bf5


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/2443d6bf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2443d6bf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2443d6bf

Branch: refs/heads/branch-2.1
Commit: 2443d6bf5aebea8aa6382602cbabf8f29f99c3df
Parents: 3ba8c39
Author: Andrew Onishuk 
Authored: Tue Oct 13 18:41:32 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Oct 13 18:41:32 2015 +0300

--
 ambari-admin/pom.xml  | 4 ++--
 ambari-agent/pom.xml  | 4 ++--
 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| 4 ++--
 ambari-metrics/ambari-metrics-common/pom.xml  | 2 +-
 ambari-metrics/ambari-metrics-flume-sink/pom.xml  | 4 ++--
 ambari-metrics/ambari-metrics-hadoop-sink/pom.xml | 4 ++--
 ambari-metrics/ambari-metrics-host-monitoring/pom.xml | 4 ++--
 ambari-metrics/ambari-metrics-kafka-sink/pom.xml  | 4 ++--
 ambari-metrics/ambari-metrics-storm-sink/pom.xml  | 4 ++--
 ambari-metrics/ambari-metrics-timelineservice/pom.xml | 6 +++---
 ambari-metrics/pom.xml| 2 +-
 ambari-project/pom.xml| 4 ++--
 ambari-server/pom.xml | 4 ++--
 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  | 4 ++--
 ambari-web/pom.xml| 4 ++--
 contrib/views/capacity-scheduler/pom.xml  | 2 +-
 contrib/views/files/pom.xml   | 2 +-
 contrib/views/hive/pom.xml| 2 +-
 contrib/views/jobs/pom.xml| 4 ++--
 contrib/views/pig/pom.xml | 2 +-
 contrib/views/pom.xml | 4 ++--
 contrib/views/slider/pom.xml  | 4 ++--
 contrib/views/storm/pom.xml   | 2 +-
 contrib/views/tez/pom.xml | 2 +-
 contrib/views/utils/pom.xml   | 2 +-
 pom.xml   | 2 +-
 32 files changed, 56 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2443d6bf/ambari-admin/pom.xml
--
diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml
index 43764b8..c80549c 100644
--- a/ambari-admin/pom.xml
+++ b/ambari-admin/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.ambari
 ambari-project
-2.1.2.1.0
+2.1.0.0.0
 ../ambari-project
   
   4.0.0
@@ -27,7 +27,7 @@
   ambari-admin
   jar
   Ambari Admin View
-  2.1.2.1.0
+  2.1.0.0.0
   Admin control panel
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/2443d6bf/ambari-agent/pom.xml
--
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 83852cd..38f436e 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -19,14 +19,14 @@
   
 org.apache.ambari
 ambari-project
-2.1.2.1.0
+2.1.0.0.0
 ../ambari-project
   
   4.0.0
   org.apache.ambari
   ambari-agent
   pom
-  2.1.2.1.0
+  2.1.0.0.0
   Ambari Agent
   Ambari Agent
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/2443d6bf/ambari-client/groovy-client/pom.xml
--
diff --git a/ambari-client/groovy-client/pom.xml 
b/ambari-client/groovy-client/pom.xml
index 1568c94..3dbc78e 100644
--- a/ambari-client/groovy-client/pom.xml
+++ b/ambari-client/groovy-client/pom.xml
@@ -12,14 +12,14 @@
   
 ambari-client
 org.apache.ambari
-2.1.2.1.0
+2.1.0.0.0
 ../../ambari-client/
   
   4.0.0
   org.apache.ambari
   groovy-client
   jar
-  2.1.2.1.0
+  2.1.0.0.0
   Ambari Groovy Client
   Ambari Groovy client
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/2443d6bf/ambari-client/pom.xml
--
diff --git a/ambari-client/pom.xml b/ambari-client/pom.xml
index 44b5948..2f8f3fc 100755
--- a/ambari-client/pom.xml
+++ b/ambari-client/pom.xml
@@ -20,14 +20,14 @@
   
 org.apache.ambari