AMBARI-25801: Make the version for Kafka,Hbase,Hadoop to be consistent with Ambari

ambari-metrics-assembly/pom.xml

@@ -292,6 +292,9 @@
                           <location>${project.build.directory}/embedded/${hadoop.folder}/share/hadoop/common/lib</location>
                           <includes>
                             <include>commons-beanutils-*.jar</include>
+                            <include>hadoop-shaded-*.jar</include>
+                            <include>hadoop-auth-${hadoop.version}.jar</include>
+                            <include>hadoop-annotations-${hadoop.version}.jar</include>
                           </includes>
                         </source>
                         <source>

ambari-metrics-common/pom.xml

@@ -166,7 +166,7 @@
     <dependency>
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-framework</artifactId>
-      <version>4.0.0</version>
+      <version>${curator.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
@@ -186,7 +186,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-annotations</artifactId>
-      <version>2.6.0</version>
+      <version>${hadoop.version}</version>
       <exclusions>
         <exclusion>
           <groupId>jdk.tools</groupId>

ambari-metrics-hadoop-sink/pom.xml

@@ -140,7 +140,7 @@ limitations under the License.
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
-      <version>3.0.0</version>
+      <version>${hadoop.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

ambari-metrics-host-aggregator/pom.xml

@@ -82,7 +82,7 @@
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
-            <version>3.0.0</version>
+            <version>${hadoop.version}</version>
         </dependency>
         <dependency>
             <groupId>com.sun.jersey.jersey-test-framework</groupId>

ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor

@@ -29,6 +29,11 @@ STOP_TIMEOUT=10
 OK=0
 NOTOK=1
 
+# checking for default Python 2
+if [ -a /usr/bin/python2 ] && [ -z "$PYTHON" ]; then
+  PYTHON=/usr/bin/python2
+fi
+
 if [ -a /usr/bin/python2.7 ] && [ -z "${PYTHON}" ]; then
   PYTHON=/usr/bin/python2.7
 fi
@@ -209,6 +214,8 @@ case "$1" in
           kill -9 "${pid}" >/dev/null 2>&1
         fi
 
+        sleep 2
+
         if ps -p "${pid}" > /dev/null 2>&1; then
           echo "ERROR: Unable to kill ${pid}"
         else

ambari-metrics-kafka-sink/pom.xml

@@ -142,8 +142,8 @@ limitations under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
-      <artifactId>kafka_2.10</artifactId>
-      <version>0.10.2.1</version>
+      <artifactId>kafka_2.12</artifactId>
+      <version>${kafka.version}</version>
       <exclusions>
         <exclusion>
           <groupId>com.sun.jdmk</groupId>
@@ -168,9 +168,9 @@ limitations under the License.
       </exclusions>
     </dependency>
     <dependency>
-    <groupId>org.apache.kafka</groupId>
-    <artifactId>kafka-clients</artifactId>
-    <version>0.10.1.0</version>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>kafka-clients</artifactId>
+      <version>${kafka.version}</version>
     </dependency>
     <dependency>
       <groupId>com.yammer.metrics</groupId>

ambari-metrics-timelineservice/pom.xml

@@ -34,9 +34,6 @@
     <!-- Needed for generating FindBugs warnings using parent pom -->
     <!--<yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>-->
     <protobuf.version>2.5.0</protobuf.version>
-    <phoenix.version>5.1.2</phoenix.version>
-    <hbase.version>2.4.13</hbase.version>
-    <slf4j.version>2.0.0</slf4j.version>
   </properties>
 
   <build>
@@ -325,7 +322,7 @@
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
-      <version>3.5.9</version>
+      <version>${zookeeper.version}</version>
       <exclusions>
         <exclusion>
           <artifactId>jline</artifactId>
@@ -682,6 +679,17 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-yarn-server-applicationhistoryservice</artifactId>
+      <version>${hadoop.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
 
     <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
     <dependency>
@@ -812,7 +820,7 @@
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka-clients</artifactId>
-      <version>0.11.0.3</version>
+      <version>${kafka.version}</version>
     </dependency>
 
     <dependency>

pom.xml

@@ -38,6 +38,11 @@
     <python.ver>python &gt;= 2.6</python.ver>
     <deb.python.ver>python (&gt;= 2.6)</deb.python.ver>
     <slf4j.version>2.0.0</slf4j.version>
+    <zookeeper.version>3.5.9</zookeeper.version>
+    <kafka.version>2.8.1</kafka.version>
+    <phoenix.version>5.1.2</phoenix.version>
+    <hbase.version>2.4.13</hbase.version>
+    <curator.version>4.2.0</curator.version>
     <hbase.tar>https://archive.apache.org/dist/hbase/2.4.13/hbase-2.4.13-bin.tar.gz</hbase.tar>
     <hbase.folder>hbase-2.4.13</hbase.folder>
     <hadoop.tar>https://archive.apache.org/dist/hadoop/common/hadoop-3.3.4/hadoop-3.3.4.tar.gz</hadoop.tar>