AMBARI-5007. Cleanup stack version info. (Siddharth Wagle via mahadev)

ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java

@@ -61,8 +61,7 @@ import org.xml.sax.SAXException;
  */
 public class StackExtensionHelper {
   private File stackRoot;
-  private final static Logger LOG = LoggerFactory
-    .getLogger(StackExtensionHelper.class);
+  private final static Logger LOG = LoggerFactory.getLogger(StackExtensionHelper.class);
   private final Map<String, StackInfo> stackVersionMap = new HashMap<String,
     StackInfo>();
   private Map<String, List<StackInfo>> stackParentsMap = null;
@@ -127,7 +126,9 @@ public class StackExtensionHelper {
     mergedServiceInfo.setComment(childService.getComment());
     mergedServiceInfo.setUser(childService.getUser());
     mergedServiceInfo.setVersion(childService.getVersion());
-    mergedServiceInfo.setConfigDependencies(childService.getConfigDependencies());
+    mergedServiceInfo.setConfigDependencies(
+      childService.getConfigDependencies() != null ?
+        childService.getConfigDependencies() : new ArrayList<String>());
 
     Map<String, ServiceOsSpecific> osSpecific = childService.getOsSpecifics();
     if (! osSpecific.isEmpty()) {

ambari-server/src/main/resources/stacks/HDP/2.0.6/metainfo.xml

@@ -17,6 +17,6 @@
 -->
 <metainfo>
     <versions>
-	  <active>true</active>
+	  <active>false</active>
     </versions>
 </metainfo>

ambari-server/src/main/resources/stacks/HDP/2.0/metainfo.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<metainfo>
+    <versions>
+      <active>true</active>
+    </versions>
+    <extends>2.0.6</extends>
+</metainfo>

ambari-server/src/main/resources/stacks/HDP/2.0/repos/repoinfo.xml

@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<reposinfo>
+  <os type="centos6">
+    <repo>
+      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.10.0</baseurl>
+      <repoid>HDP-2.0</repoid>
+      <reponame>HDP</reponame>
+    </repo>
+  </os>
+  <os type="centos5">
+    <repo>
+      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.10.0</baseurl>
+      <repoid>HDP-2.0</repoid>
+      <reponame>HDP</reponame>
+    </repo>
+  </os>
+  <os type="redhat6">
+    <repo>
+      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.10.0</baseurl>
+      <repoid>HDP-2.0</repoid>
+      <reponame>HDP</reponame>
+    </repo>
+  </os>
+  <os type="redhat5">
+    <repo>
+      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.10.0</baseurl>
+      <repoid>HDP-2.0</repoid>
+      <reponame>HDP</reponame>
+    </repo>
+  </os>
+   <os type="oraclelinux6">
+    <repo>
+      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.10.0</baseurl>
+      <repoid>HDP-2.0</repoid>
+      <reponame>HDP</reponame>
+    </repo>
+  </os>
+  <os type="oraclelinux5">
+    <repo>
+      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.10.0</baseurl>
+      <repoid>HDP-2.0</repoid>
+      <reponame>HDP</reponame>
+    </repo>
+  </os>
+  <os type="suse11">
+    <repo>
+      <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.10.0</baseurl>
+      <repoid>HDP-2.0</repoid>
+      <reponame>HDP</reponame>
+    </repo>
+  </os>
+  <os type="sles11">
+    <repo>
+      <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.10.0</baseurl>
+      <repoid>HDP-2.0</repoid>
+      <reponame>HDP</reponame>
+    </repo>
+  </os>
+</reposinfo>

ambari-server/src/main/resources/stacks/HDP/2.0/services/HBASE/metainfo.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<metainfo>
+  <schemaVersion>2.0</schemaVersion>
+  <services>
+    <service>
+      <name>HBASE</name>
+      <comment>Non-relational distributed database and centralized service for configuration management &amp;
+        synchronization
+      </comment>
+      <version>0.96.0.2.0</version>
+    </service>
+  </services>
+</metainfo>

ambari-server/src/main/resources/stacks/HDP/2.0/services/HDFS/metainfo.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<metainfo>
+  <schemaVersion>2.0</schemaVersion>
+  <services>
+    <service>
+      <name>HDFS</name>
+      <comment>Apache Hadoop Distributed File System</comment>
+      <version>2.1.0.2.0</version>
+    </service>
+  </services>
+</metainfo>

ambari-server/src/main/resources/stacks/HDP/2.0/services/HIVE/metainfo.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<metainfo>
+  <schemaVersion>2.0</schemaVersion>
+  <services>
+    <service>
+      <name>HIVE</name>
+      <comment>Data warehouse system for ad-hoc queries &amp; analysis of large datasets and table &amp; storage management service</comment>
+      <version>0.12.0.2.0</version>
+    </service>
+    <service>
+      <name>HCATALOG</name>
+      <comment>This is comment for HCATALOG service</comment>
+      <version>0.12.0.2.0</version>
+    </service>
+  </services>
+</metainfo>

ambari-server/src/main/resources/stacks/HDP/2.0/services/OOZIE/metainfo.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<metainfo>
+  <schemaVersion>2.0</schemaVersion>
+  <services>
+    <service>
+      <name>OOZIE</name>
+      <comment>System for workflow coordination and execution of Apache Hadoop jobs.
+        This also includes the installation of the optional Oozie Web Console which relies on and will install the &lt;a target="_blank" href="http://www.sencha.com/products/extjs/license/"&gt;ExtJS&lt;/a&gt; Library.
+      </comment>
+      <version>4.0.0.2.0</version>
+    </service>
+  </services>
+</metainfo>

ambari-server/src/main/resources/stacks/HDP/2.0/services/PIG/metainfo.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<metainfo>
+  <schemaVersion>2.0</schemaVersion>
+  <services>
+    <service>
+      <name>PIG</name>
+      <comment>Scripting platform for analyzing large datasets</comment>
+      <version>0.12.0.2.0</version>
+    </service>
+  </services>
+</metainfo>

ambari-server/src/main/resources/stacks/HDP/2.0/services/SQOOP/metainfo.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<metainfo>
+  <schemaVersion>2.0</schemaVersion>
+  <services>
+    <service>
+      <name>SQOOP</name>
+      <comment>Tool for transferring bulk data between Apache Hadoop and
+        structured data stores such as relational databases
+      </comment>
+      <version>1.4.4.2.0</version>
+    </service>
+  </services>
+</metainfo>

ambari-server/src/main/resources/stacks/HDP/2.0/services/WEBHCAT/metainfo.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<metainfo>
+  <schemaVersion>2.0</schemaVersion>
+  <services>
+    <service>
+      <name>WEBHCAT</name>
+      <comment>This is comment for WEBHCAT service</comment>
+      <version>0.12.0.2.0</version>
+    </service>
+  </services>
+</metainfo>

ambari-server/src/main/resources/stacks/HDP/2.0/services/YARN/metainfo.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<metainfo>
+  <schemaVersion>2.0</schemaVersion>
+  <services>
+    <service>
+      <name>YARN</name>
+      <comment>Apache Hadoop NextGen MapReduce (YARN)</comment>
+      <version>2.1.0.2.0</version>
+    </service>
+    <service>
+      <name>MAPREDUCE2</name>
+      <comment>Apache Hadoop NextGen MapReduce (YARN)</comment>
+      <version>2.1.0.2.0</version>
+    </service>
+  </services>
+</metainfo>

ambari-server/src/main/resources/stacks/HDP/2.0/services/ZOOKEEPER/metainfo.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<metainfo>
+  <schemaVersion>2.0</schemaVersion>
+  <services>
+    <service>
+      <name>ZOOKEEPER</name>
+      <comment>Centralized service which provides highly reliable distributed coordination</comment>
+      <version>3.4.5.2.0</version>
+    </service>
+  </services>
+</metainfo>

ambari-server/src/main/resources/stacks/HDP/2.1/services/HBASE/metainfo.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<metainfo>
+  <schemaVersion>2.0</schemaVersion>
+  <services>
+    <service>
+      <name>HBASE</name>
+      <comment>Non-relational distributed database and centralized service for configuration management &amp;
+        synchronization
+      </comment>
+      <version>0.96.0.2.1</version>
+    </service>
+  </services>
+</metainfo>

ambari-server/src/main/resources/stacks/HDP/2.1/services/HDFS/metainfo.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<metainfo>
+  <schemaVersion>2.0</schemaVersion>
+  <services>
+    <service>
+      <name>HDFS</name>
+      <comment>Apache Hadoop Distributed File System</comment>
+      <version>2.1.0.2.1</version>
+    </service>
+  </services>
+</metainfo>

ambari-server/src/main/resources/stacks/HDP/2.1.1/services/HIVE/metainfo.xml → ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml

@@ -21,7 +21,7 @@
     <service>
       <name>HIVE</name>
       <comment>Data warehouse system for ad-hoc queries &amp; analysis of large datasets and table &amp; storage management service</comment>
-      <version>0.12.0.2.1.1</version>
+      <version>0.12.0.2.1</version>
 
       <configuration-dependencies>
         <config-type>hive-site</config-type>
@@ -35,7 +35,7 @@
     <service>
       <name>HCATALOG</name>
       <comment>This is comment for HCATALOG service</comment>
-      <version>0.12.0.2.0.6.0</version>
+      <version>0.12.0.2.0</version>
       <osSpecifics>
         <osSpecific>
           <osType>any</osType>

ambari-server/src/main/resources/stacks/HDP/2.1.1/services/OOZIE/metainfo.xml → ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/metainfo.xml

@@ -22,7 +22,7 @@
       <name>OOZIE</name>
       <comment>System for workflow coordination and execution of Apache Hadoop jobs.  This also includes the installation of the optional Oozie Web Console which relies on and will install the &lt;a target="_blank" href="http://www.sencha.com/products/extjs/license/"&gt;ExtJS&lt;/a&gt; Library.
       </comment>
-      <version>4.0.0.2.1.1</version>
+      <version>4.0.0.2.1</version>
 
       <osSpecifics>
         <osSpecific>

ambari-server/src/main/resources/stacks/HDP/2.1/services/PIG/metainfo.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<metainfo>
+  <schemaVersion>2.0</schemaVersion>
+  <services>
+    <service>
+      <name>PIG</name>
+      <comment>Scripting platform for analyzing large datasets</comment>
+      <version>0.12.0.2.1</version>
+    </service>
+  </services>
+</metainfo>

ambari-server/src/main/resources/stacks/HDP/2.1/services/SQOOP/metainfo.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<metainfo>
+  <schemaVersion>2.0</schemaVersion>
+  <services>
+    <service>
+      <name>SQOOP</name>
+      <comment>Tool for transferring bulk data between Apache Hadoop and
+        structured data stores such as relational databases
+      </comment>
+      <version>1.4.4.2.1</version>
+    </service>
+  </services>
+</metainfo>

ambari-server/src/main/resources/stacks/HDP/2.1.1/services/TEZ/metainfo.xml → ambari-server/src/main/resources/stacks/HDP/2.1/services/TEZ/metainfo.xml

@@ -21,7 +21,7 @@
     <service>
       <name>TEZ</name>
       <comment>Tez is the next generation Hadoop Query Processing framework written on top of YARN.</comment>
-      <version>0.4.0.2.1.1.0</version>
+      <version>0.4.0.2.1</version>
       <components>
         <component>
           <name>TEZ_CLIENT</name>

ambari-server/src/main/resources/stacks/HDP/2.1.1/services/WEBHCAT/metainfo.xml → ambari-server/src/main/resources/stacks/HDP/2.1/services/WEBHCAT/metainfo.xml

@@ -21,7 +21,7 @@
     <service>
       <name>WEBHCAT</name>
       <comment>This is comment for WEBHCAT service</comment>
-      <version>0.12.0.2.1.1</version>
+      <version>0.12.0.2.1</version>
       <osSpecifics>
         <osSpecific>
           <osType>any</osType>

ambari-server/src/main/resources/stacks/HDP/2.1.1/services/YARN/metainfo.xml → ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/metainfo.xml

@@ -22,7 +22,7 @@
         <service>
             <name>YARN</name>
             <comment>Apache Hadoop NextGen MapReduce (YARN)</comment>
-            <version>2.1.0.2.1.1</version>
+            <version>2.1.0.2.1</version>
             <components>
 
                 <component>

ambari-server/src/main/resources/stacks/HDP/2.1/services/ZOOKEEPER/metainfo.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<metainfo>
+  <schemaVersion>2.0</schemaVersion>
+  <services>
+    <service>
+      <name>ZOOKEEPER</name>
+      <comment>Centralized service which provides highly reliable distributed
+        coordination.</comment>
+      <version>3.4.5.2.1</version>
+    </service>
+  </services>
+</metainfo>

ambari-server/src/test/python/stacks/2.1.1/FALCON/test_falcon_client.py → ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py

@@ -23,7 +23,7 @@ from stacks.utils.RMFTestCase import *
 
 class TestFalconClient(RMFTestCase):
   def test_configure_default(self):
-    self.executeScript("2.1.1/services/FALCON/package/scripts/falcon_client.py",
+    self.executeScript("2.1/services/FALCON/package/scripts/falcon_client.py",
                        classname="FalconClient",
                        command="configure",
                        config_file="default.json"

ambari-server/src/test/python/stacks/2.1.1/FALCON/test_falcon_server.py → ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py

@@ -24,7 +24,7 @@ from stacks.utils.RMFTestCase import *
 class TestFalconServer(RMFTestCase):
 
   def test_start_default(self):
-    self.executeScript("2.1.1/services/FALCON/package/scripts/falcon_server.py",
+    self.executeScript("2.1/services/FALCON/package/scripts/falcon_server.py",
                        classname="FalconServer",
                        command="start",
                        config_file="default.json"
@@ -48,7 +48,7 @@ class TestFalconServer(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_stop_default(self):
-    self.executeScript("2.1.1/services/FALCON/package/scripts/falcon_server.py",
+    self.executeScript("2.1/services/FALCON/package/scripts/falcon_server.py",
                        classname="FalconServer",
                        command="stop",
                        config_file="default.json"
@@ -74,7 +74,7 @@ class TestFalconServer(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_configure_default(self):
-    self.executeScript("2.1.1/services/FALCON/package/scripts/falcon_server.py",
+    self.executeScript("2.1/services/FALCON/package/scripts/falcon_server.py",
                        classname="FalconServer",
                        command="configure",
                        config_file="default.json"

ambari-server/src/test/python/stacks/2.1.1/FALCON/test_service_check.py → ambari-server/src/test/python/stacks/2.1/FALCON/test_service_check.py

@@ -24,7 +24,7 @@ from stacks.utils.RMFTestCase import *
 class TestFalconServer(RMFTestCase):
 
   def test_service_check(self):
-    self.executeScript("2.1.1/services/FALCON/package/scripts/service_check.py",
+    self.executeScript("2.1/services/FALCON/package/scripts/service_check.py",
                        classname="FalconServiceCheck",
                        command="service_check",
                        config_file="default.json"
@@ -40,7 +40,7 @@ class TestFalconServer(RMFTestCase):
                               try_sleep = 20,)
     self.assertNoMoreResources()
   def test_service_check_secured(self):
-    self.executeScript("2.1.1/services/FALCON/package/scripts/service_check.py",
+    self.executeScript("2.1/services/FALCON/package/scripts/service_check.py",
                        classname="FalconServiceCheck",
                        command="service_check",
                        config_file="secured.json"

ambari-server/src/test/python/stacks/2.1.1/STORM/test_service_check.py → ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py

@@ -27,7 +27,7 @@ import  resource_management.libraries.functions
 class TestStormServiceCheck(RMFTestCase):
 
   def test_service_check(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/service_check.py",
+    self.executeScript("2.1/services/STORM/package/scripts/service_check.py",
                        classname="ServiceCheck",
                        command="service_check",
                        config_file="default.json"

ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_drpc_server.py → ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py

@@ -26,7 +26,7 @@ import  resource_management.core.source
 class TestStormDrpcServer(RMFTestCase):
 
   def test_configure_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/drpc_server.py",
+    self.executeScript("2.1/services/STORM/package/scripts/drpc_server.py",
                        classname = "DrpcServer",
                        command = "configure",
                        config_file="default.json"
@@ -35,7 +35,7 @@ class TestStormDrpcServer(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_start_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/drpc_server.py",
+    self.executeScript("2.1/services/STORM/package/scripts/drpc_server.py",
                        classname = "DrpcServer",
                        command = "start",
                        config_file="default.json"
@@ -59,7 +59,7 @@ class TestStormDrpcServer(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_stop_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/drpc_server.py",
+    self.executeScript("2.1/services/STORM/package/scripts/drpc_server.py",
                        classname = "DrpcServer",
                        command = "stop",
                        config_file="default.json"
@@ -75,7 +75,7 @@ class TestStormDrpcServer(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_configure_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/drpc_server.py",
+    self.executeScript("2.1/services/STORM/package/scripts/drpc_server.py",
                        classname = "DrpcServer",
                        command = "configure",
                        config_file="secured.json"
@@ -84,7 +84,7 @@ class TestStormDrpcServer(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_start_secured(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/drpc_server.py",
+    self.executeScript("2.1/services/STORM/package/scripts/drpc_server.py",
                        classname = "DrpcServer",
                        command = "start",
                        config_file="secured.json"
@@ -108,7 +108,7 @@ class TestStormDrpcServer(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_stop_secured(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/drpc_server.py",
+    self.executeScript("2.1/services/STORM/package/scripts/drpc_server.py",
                        classname = "DrpcServer",
                        command = "stop",
                        config_file="secured.json"

ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_logviewer_server.py → ambari-server/src/test/python/stacks/2.1/STORM/test_storm_logviewer_server.py

@@ -26,7 +26,7 @@ import  resource_management.core.source
 class TestStormLogviewerServer(RMFTestCase):
 
   def test_configure_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/logviewer_server.py",
+    self.executeScript("2.1/services/STORM/package/scripts/logviewer_server.py",
                        classname = "LogviewerServer",
                        command = "configure",
                        config_file="default.json"
@@ -35,7 +35,7 @@ class TestStormLogviewerServer(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_start_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/logviewer_server.py",
+    self.executeScript("2.1/services/STORM/package/scripts/logviewer_server.py",
                        classname = "LogviewerServer",
                        command = "start",
                        config_file="default.json"
@@ -59,7 +59,7 @@ class TestStormLogviewerServer(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_stop_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/logviewer_server.py",
+    self.executeScript("2.1/services/STORM/package/scripts/logviewer_server.py",
                        classname = "LogviewerServer",
                        command = "stop",
                        config_file="default.json"
@@ -75,7 +75,7 @@ class TestStormLogviewerServer(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_configure_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/logviewer_server.py",
+    self.executeScript("2.1/services/STORM/package/scripts/logviewer_server.py",
                        classname = "LogviewerServer",
                        command = "configure",
                        config_file="secured.json"
@@ -84,7 +84,7 @@ class TestStormLogviewerServer(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_start_secured(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/logviewer_server.py",
+    self.executeScript("2.1/services/STORM/package/scripts/logviewer_server.py",
                        classname = "LogviewerServer",
                        command = "start",
                        config_file="secured.json"
@@ -108,7 +108,7 @@ class TestStormLogviewerServer(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_stop_secured(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/logviewer_server.py",
+    self.executeScript("2.1/services/STORM/package/scripts/logviewer_server.py",
                        classname = "LogviewerServer",
                        command = "stop",
                        config_file="secured.json"

ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_nimbus.py → ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py

@@ -26,7 +26,7 @@ import  resource_management.core.source
 class TestStormNimbus(RMFTestCase):
 
   def test_configure_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/nimbus.py",
+    self.executeScript("2.1/services/STORM/package/scripts/nimbus.py",
                        classname = "Nimbus",
                        command = "configure",
                        config_file="default.json"
@@ -35,7 +35,7 @@ class TestStormNimbus(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_start_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/nimbus.py",
+    self.executeScript("2.1/services/STORM/package/scripts/nimbus.py",
                        classname = "Nimbus",
                        command = "start",
                        config_file="default.json"
@@ -59,7 +59,7 @@ class TestStormNimbus(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_stop_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/nimbus.py",
+    self.executeScript("2.1/services/STORM/package/scripts/nimbus.py",
                        classname = "Nimbus",
                        command = "stop",
                        config_file="default.json"
@@ -75,7 +75,7 @@ class TestStormNimbus(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_configure_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/nimbus.py",
+    self.executeScript("2.1/services/STORM/package/scripts/nimbus.py",
                        classname = "Nimbus",
                        command = "configure",
                        config_file="secured.json"
@@ -84,7 +84,7 @@ class TestStormNimbus(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_start_secured(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/nimbus.py",
+    self.executeScript("2.1/services/STORM/package/scripts/nimbus.py",
                        classname = "Nimbus",
                        command = "start",
                        config_file="secured.json"
@@ -108,7 +108,7 @@ class TestStormNimbus(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_stop_secured(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/nimbus.py",
+    self.executeScript("2.1/services/STORM/package/scripts/nimbus.py",
                        classname = "Nimbus",
                        command = "stop",
                        config_file="secured.json"

ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_rest_api_service.py → ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py

@@ -26,7 +26,7 @@ import  resource_management.core.source
 class TestStormRestApi(RMFTestCase):
 
   def test_configure_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/rest_api.py",
+    self.executeScript("2.1/services/STORM/package/scripts/rest_api.py",
                        classname = "StormRestApi",
                        command = "configure",
                        config_file="default.json"
@@ -36,7 +36,7 @@ class TestStormRestApi(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_start_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/rest_api.py",
+    self.executeScript("2.1/services/STORM/package/scripts/rest_api.py",
                        classname = "StormRestApi",
                        command = "start",
                        config_file="default.json"
@@ -60,7 +60,7 @@ class TestStormRestApi(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_stop_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/rest_api.py",
+    self.executeScript("2.1/services/STORM/package/scripts/rest_api.py",
                        classname = "StormRestApi",
                        command = "stop",
                        config_file="default.json"
@@ -76,7 +76,7 @@ class TestStormRestApi(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_configure_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/rest_api.py",
+    self.executeScript("2.1/services/STORM/package/scripts/rest_api.py",
                        classname = "StormRestApi",
                        command = "configure",
                        config_file="secured.json"
@@ -85,7 +85,7 @@ class TestStormRestApi(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_start_secured(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/rest_api.py",
+    self.executeScript("2.1/services/STORM/package/scripts/rest_api.py",
                        classname = "StormRestApi",
                        command = "start",
                        config_file="secured.json"
@@ -109,7 +109,7 @@ class TestStormRestApi(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_stop_secured(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/rest_api.py",
+    self.executeScript("2.1/services/STORM/package/scripts/rest_api.py",
                        classname = "StormRestApi",
                        command = "stop",
                        config_file="secured.json"

ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_supervisor.py → ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py

@@ -26,7 +26,7 @@ import  resource_management.core.source
 class TestStormSupervisor(RMFTestCase):
 
   def test_configure_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/supervisor.py",
+    self.executeScript("2.1/services/STORM/package/scripts/supervisor.py",
                        classname = "Supervisor",
                        command = "configure",
                        config_file="default.json"
@@ -35,7 +35,7 @@ class TestStormSupervisor(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_start_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/supervisor.py",
+    self.executeScript("2.1/services/STORM/package/scripts/supervisor.py",
                        classname = "Supervisor",
                        command = "start",
                        config_file="default.json"
@@ -59,7 +59,7 @@ class TestStormSupervisor(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_stop_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/supervisor.py",
+    self.executeScript("2.1/services/STORM/package/scripts/supervisor.py",
                        classname = "Supervisor",
                        command = "stop",
                        config_file="default.json"
@@ -75,7 +75,7 @@ class TestStormSupervisor(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_configure_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/supervisor.py",
+    self.executeScript("2.1/services/STORM/package/scripts/supervisor.py",
                        classname = "Supervisor",
                        command = "configure",
                        config_file="secured.json"
@@ -84,7 +84,7 @@ class TestStormSupervisor(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_start_secured(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/supervisor.py",
+    self.executeScript("2.1/services/STORM/package/scripts/supervisor.py",
                        classname = "Supervisor",
                        command = "start",
                        config_file="secured.json"
@@ -108,7 +108,7 @@ class TestStormSupervisor(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_stop_secured(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/supervisor.py",
+    self.executeScript("2.1/services/STORM/package/scripts/supervisor.py",
                        classname = "Supervisor",
                        command = "stop",
                        config_file="secured.json"

ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_ui_server.py → ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py

@@ -26,7 +26,7 @@ import  resource_management.core.source
 class TestStormUiServer(RMFTestCase):
 
   def test_configure_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/ui_server.py",
+    self.executeScript("2.1/services/STORM/package/scripts/ui_server.py",
                        classname = "UiServer",
                        command = "configure",
                        config_file="default.json"
@@ -35,7 +35,7 @@ class TestStormUiServer(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_start_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/ui_server.py",
+    self.executeScript("2.1/services/STORM/package/scripts/ui_server.py",
                        classname = "UiServer",
                        command = "start",
                        config_file="default.json"
@@ -59,7 +59,7 @@ class TestStormUiServer(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_stop_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/ui_server.py",
+    self.executeScript("2.1/services/STORM/package/scripts/ui_server.py",
                        classname = "UiServer",
                        command = "stop",
                        config_file="default.json"
@@ -75,7 +75,7 @@ class TestStormUiServer(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_configure_default(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/ui_server.py",
+    self.executeScript("2.1/services/STORM/package/scripts/ui_server.py",
                        classname = "UiServer",
                        command = "configure",
                        config_file="secured.json"
@@ -84,7 +84,7 @@ class TestStormUiServer(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_start_secured(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/ui_server.py",
+    self.executeScript("2.1/services/STORM/package/scripts/ui_server.py",
                        classname = "UiServer",
                        command = "start",
                        config_file="secured.json"
@@ -108,7 +108,7 @@ class TestStormUiServer(RMFTestCase):
     self.assertNoMoreResources()
 
   def test_stop_secured(self):
-    self.executeScript("2.1.1/services/STORM/package/scripts/ui_server.py",
+    self.executeScript("2.1/services/STORM/package/scripts/ui_server.py",
                        classname = "UiServer",
                        command = "stop",
                        config_file="secured.json"

ambari-server/src/test/python/stacks/2.1.1/TEZ/test_tez_client.py → ambari-server/src/test/python/stacks/2.1/TEZ/test_tez_client.py

@@ -23,7 +23,7 @@ from stacks.utils.RMFTestCase import *
 class TestTezClient(RMFTestCase):
 
   def test_configure_default(self):
-    self.executeScript("2.1.1/services/TEZ/package/scripts/tez_client.py",
+    self.executeScript("2.1/services/TEZ/package/scripts/tez_client.py",
                        classname = "TezClient",
                        command = "configure",
                        config_file="default.json"