From 39680e432011f9fcef903b4439592c533268c860 Mon Sep 17 00:00:00 2001
From: root <763669981@qq.com>
Date: Mon, 9 Sep 2024 15:35:59 +0800
Subject: [PATCH 1/4] 1.fix jar package conflict problem 2.upgrade commons-io
 to 2.8.0 3.upgrade guava to 32.1.1-jre 4.upgrade kafka to 2.8.2 5.upgrade
 zookeeper to 3.7.2 6.upgrade hbase to 2.4.17 7.upgrade hadoop to 3.3.6 8.add
 missing jar sqlline

---
 ambari-metrics-assembly/pom.xml        |   8 +-
 ambari-metrics-common/pom.xml          |   3 +-
 ambari-metrics-flume-sink/pom.xml      |   1 -
 ambari-metrics-hadoop-sink/pom.xml     |   2 +-
 ambari-metrics-host-aggregator/pom.xml |   1 -
 ambari-metrics-timelineservice/pom.xml | 111 ++++++++++++++++++++++++-
 pom.xml                                |  18 ++--
 7 files changed, 124 insertions(+), 20 deletions(-)

diff --git a/ambari-metrics-assembly/pom.xml b/ambari-metrics-assembly/pom.xml
index 8f26a5e7..53ce8d40 100644
--- a/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics-assembly/pom.xml
@@ -220,8 +220,8 @@
                             <exclude>*tests.jar</exclude>
                             <exclude>findbugs*.jar</exclude>
                             <exclude>jdk.tools*.jar</exclude>
-                            <exclude>hadoop*.jar</exclude>
-                            <exclude>hbase*.jar</exclude>
+                            <!--exclude>hadoop*.jar</exclude>
+                            <exclude>hbase*.jar</exclude-->
                           </excludes>
                         </source>
                         <source>
@@ -229,13 +229,13 @@
                             ${collector.dir}/target/ambari-metrics-timelineservice-${project.version}.jar
                           </location>
                         </source>
-                        <source>
+                        <!--source>
                           <location>${collector.dir}/target/embedded/${hbase.folder}/lib</location>
                           <includes>
                             <include>hadoop*.jar</include>
                             <include>hbase*.jar</include>
                           </includes>
-                        </source>
+                        </source-->
                       </sources>
                     </mapping>
                     <mapping>
diff --git a/ambari-metrics-common/pom.xml b/ambari-metrics-common/pom.xml
index faedbf01..b71e19db 100644
--- a/ambari-metrics-common/pom.xml
+++ b/ambari-metrics-common/pom.xml
@@ -93,7 +93,7 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.4</version>
+      <version>2.8.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
@@ -103,7 +103,6 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>28.0-jre</version>
     </dependency>
     <dependency>
       <groupId>org.apache.curator</groupId>
diff --git a/ambari-metrics-flume-sink/pom.xml b/ambari-metrics-flume-sink/pom.xml
index 6ac7f689..d08fe277 100644
--- a/ambari-metrics-flume-sink/pom.xml
+++ b/ambari-metrics-flume-sink/pom.xml
@@ -141,7 +141,6 @@ limitations under the License.
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>18.0</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/ambari-metrics-hadoop-sink/pom.xml b/ambari-metrics-hadoop-sink/pom.xml
index af23ccdb..fd925b8c 100644
--- a/ambari-metrics-hadoop-sink/pom.xml
+++ b/ambari-metrics-hadoop-sink/pom.xml
@@ -125,7 +125,7 @@ limitations under the License.
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.1</version>
+      <version>2.8.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/ambari-metrics-host-aggregator/pom.xml b/ambari-metrics-host-aggregator/pom.xml
index 5eadd9d8..e6e22a37 100644
--- a/ambari-metrics-host-aggregator/pom.xml
+++ b/ambari-metrics-host-aggregator/pom.xml
@@ -41,7 +41,6 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>18.0</version>
         </dependency>
         <dependency>
               <groupId>org.apache.ambari</groupId>
diff --git a/ambari-metrics-timelineservice/pom.xml b/ambari-metrics-timelineservice/pom.xml
index 1393492d..cab633ce 100644
--- a/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics-timelineservice/pom.xml
@@ -315,6 +315,54 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-annotations</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-hdfs-client</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-mapreduce-client-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <artifactId>hbase-mapreduce</artifactId>
+          <groupId>org.apache.hbase</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>hbase-hadoop-compat</artifactId>
+          <groupId>org.apache.hbase</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>hbase-hadoop2-compat</artifactId>
+          <groupId>org.apache.hbase</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>hbase-common</artifactId>
+          <groupId>org.apache.hbase</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>hbase-protocol</artifactId>
+          <groupId>org.apache.hbase</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>hbase-protocol-shaded</artifactId>
+          <groupId>org.apache.hbase</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>hbase-metrics-api</artifactId>
+          <groupId>org.apache.hbase</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>hbase-zookeeper</artifactId>
+          <groupId>org.apache.hbase</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>hbase-shaded-miscellaneous</artifactId>
+          <groupId>org.apache.hbase.thirdparty</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>hbase-shaded-protobuf</artifactId>
+          <groupId>org.apache.hbase.thirdparty</groupId>
+        </exclusion>
         <exclusion>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -342,6 +390,62 @@
       </exclusions>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-client</artifactId>
+      <version>${hadoop.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdfs</artifactId>
+      <version>${hadoop.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-minicluster</artifactId>
+      <version>${hadoop.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-auth</artifactId>
+      <version>${hadoop.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-distcp</artifactId>
+      <version>${hadoop.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-server</artifactId>
+      <version>${hbase.version}</version>
+      <exclusions>
+          <exclusion>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+          </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-client</artifactId>
+      <version>${hbase.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-mapreduce</artifactId>
+      <version>${hbase.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-metrics</artifactId>
+      <version>${hbase.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>sqlline</groupId>
+      <artifactId>sqlline</artifactId>
+      <version>1.9.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.phoenix</groupId>
       <artifactId>phoenix-hbase-compat-2.4.1</artifactId>
@@ -524,7 +628,6 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>28.0-jre</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -539,7 +642,7 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.4</version>
+      <version>2.8.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -788,6 +891,10 @@
           <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>jackson-databind</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-minicluster</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 8aadd332..510447bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,17 +38,17 @@
     <python.ver>python3 &gt;= 3.0</python.ver>
     <deb.python.ver>python3 (&gt;= 3.0)</deb.python.ver>
     <slf4j.version>2.0.0</slf4j.version>
-    <zookeeper.version>3.5.9</zookeeper.version>
-    <kafka.version>2.8.1</kafka.version>
+    <zookeeper.version>3.7.2</zookeeper.version>
+    <kafka.version>2.8.2</kafka.version>
     <phoenix.version>5.1.2</phoenix.version>
-    <hbase.version>2.4.13</hbase.version>
+    <hbase.version>2.4.17</hbase.version>
     <curator.version>4.2.0</curator.version>
     <commons-lang3.version>3.12.0</commons-lang3.version>
-    <hbase.tar>http://repo.bigtop.apache.org.s3.amazonaws.com/bigtop-stack-binary/3.2.0/centos-7/x86_64/hbase-2.4.13-bin.tar.gz</hbase.tar>
-    <hbase.folder>hbase-2.4.13</hbase.folder>
-    <hadoop.tar>http://repo.bigtop.apache.org.s3.amazonaws.com/bigtop-stack-binary/3.2.0/centos-7/x86_64/hadoop-3.3.4.tar.gz</hadoop.tar>
-    <hadoop.folder>hadoop-3.3.4</hadoop.folder>
-    <hadoop.version>3.3.4</hadoop.version>
+    <hbase.tar>http://repo.bigtop.apache.org.s3.amazonaws.com/bigtop-stack-binary/3.2.0/centos-7/x86_64/hbase-2.4.17-bin.tar.gz</hbase.tar>
+    <hbase.folder>hbase-2.4.17</hbase.folder>
+    <hadoop.tar>http://repo.bigtop.apache.org.s3.amazonaws.com/bigtop-stack-binary/3.2.0/centos-7/x86_64/hadoop-3.3.6.tar.gz</hadoop.tar>
+    <hadoop.folder>hadoop-3.3.6</hadoop.folder>
+    <hadoop.version>3.3.6</hadoop.version>
     <grafana.folder>grafana-v11.1.4</grafana.folder>
     <grafana.tar>https://dl.grafana.com/oss/release/grafana-11.1.4.linux-amd64.tar.gz</grafana.tar>
     <phoenix.tar>http://repo.bigtop.apache.org.s3.amazonaws.com/bigtop-stack-binary/3.2.0/centos-7/x86_64/phoenix-hbase-2.4-5.1.2-bin.tar.gz</phoenix.tar>
@@ -133,7 +133,7 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>28.0-jre</version>
+        <version>32.1.1-jre</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

From 022ccc2e80b68fb9f454a7ec18708303f9c93634 Mon Sep 17 00:00:00 2001
From: root <763669981@qq.com>
Date: Mon, 9 Sep 2024 18:36:57 +0800
Subject: [PATCH 2/4] 1.upgrade phoenix to 2.4-5.1.3 2.modify download url

---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 510447bc..4a26227d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,19 +40,19 @@
     <slf4j.version>2.0.0</slf4j.version>
     <zookeeper.version>3.7.2</zookeeper.version>
     <kafka.version>2.8.2</kafka.version>
-    <phoenix.version>5.1.2</phoenix.version>
+    <phoenix.version>5.1.3</phoenix.version>
     <hbase.version>2.4.17</hbase.version>
     <curator.version>4.2.0</curator.version>
     <commons-lang3.version>3.12.0</commons-lang3.version>
-    <hbase.tar>http://repo.bigtop.apache.org.s3.amazonaws.com/bigtop-stack-binary/3.2.0/centos-7/x86_64/hbase-2.4.17-bin.tar.gz</hbase.tar>
+    <hbase.tar>https://archive.apache.org/dist/hbase/2.4.17/hbase-2.4.17-bin.tar.gz</hbase.tar>
     <hbase.folder>hbase-2.4.17</hbase.folder>
-    <hadoop.tar>http://repo.bigtop.apache.org.s3.amazonaws.com/bigtop-stack-binary/3.2.0/centos-7/x86_64/hadoop-3.3.6.tar.gz</hadoop.tar>
+    <hadoop.tar>https://archive.apache.org/dist/hadoop/common/hadoop-3.3.6/hadoop-3.3.6.tar.gz</hadoop.tar>
     <hadoop.folder>hadoop-3.3.6</hadoop.folder>
     <hadoop.version>3.3.6</hadoop.version>
     <grafana.folder>grafana-v11.1.4</grafana.folder>
     <grafana.tar>https://dl.grafana.com/oss/release/grafana-11.1.4.linux-amd64.tar.gz</grafana.tar>
-    <phoenix.tar>http://repo.bigtop.apache.org.s3.amazonaws.com/bigtop-stack-binary/3.2.0/centos-7/x86_64/phoenix-hbase-2.4-5.1.2-bin.tar.gz</phoenix.tar>
-    <phoenix.folder>phoenix-hbase-2.4-5.1.2-bin</phoenix.folder>
+    <phoenix.tar>https://archive.apache.org/dist/phoenix/phoenix-5.1.3/phoenix-hbase-2.4-5.1.3-bin.tar.gz</phoenix.tar>
+    <phoenix.folder>phoenix-hbase-2.4-5.1.3-bin</phoenix.folder>
     <resmonitor.install.dir>/usr/lib/python3.9/site-packages/resource_monitoring</resmonitor.install.dir>
     <powermock.version>1.6.2</powermock.version>
     <distMgmtSnapshotsId>apache.snapshots.https</distMgmtSnapshotsId>

From bc7096094b64193745b8f7b3165c75f29da3a9b1 Mon Sep 17 00:00:00 2001
From: root <763669981@qq.com>
Date: Tue, 10 Sep 2024 09:58:05 +0800
Subject: [PATCH 3/4] remove useless commented

---
 ambari-metrics-assembly/pom.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/ambari-metrics-assembly/pom.xml b/ambari-metrics-assembly/pom.xml
index 53ce8d40..74375cbc 100644
--- a/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics-assembly/pom.xml
@@ -220,8 +220,6 @@
                             <exclude>*tests.jar</exclude>
                             <exclude>findbugs*.jar</exclude>
                             <exclude>jdk.tools*.jar</exclude>
-                            <!--exclude>hadoop*.jar</exclude>
-                            <exclude>hbase*.jar</exclude-->
                           </excludes>
                         </source>
                         <source>
@@ -229,13 +227,6 @@
                             ${collector.dir}/target/ambari-metrics-timelineservice-${project.version}.jar
                           </location>
                         </source>
-                        <!--source>
-                          <location>${collector.dir}/target/embedded/${hbase.folder}/lib</location>
-                          <includes>
-                            <include>hadoop*.jar</include>
-                            <include>hbase*.jar</include>
-                          </includes>
-                        </source-->
                       </sources>
                     </mapping>
                     <mapping>

From ab43040ef8ec2898ef43d1db61a1daedc4b2fe22 Mon Sep 17 00:00:00 2001
From: root <763669981@qq.com>
Date: Wed, 9 Oct 2024 10:01:08 +0800
Subject: [PATCH 4/4] fix unit test failures

---
 .../metrics/core/timeline/AbstractMiniHBaseClusterTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ambari-metrics-timelineservice/src/test/java/org/apache/ambari/metrics/core/timeline/AbstractMiniHBaseClusterTest.java b/ambari-metrics-timelineservice/src/test/java/org/apache/ambari/metrics/core/timeline/AbstractMiniHBaseClusterTest.java
index 0e7949c0..83df9de8 100644
--- a/ambari-metrics-timelineservice/src/test/java/org/apache/ambari/metrics/core/timeline/AbstractMiniHBaseClusterTest.java
+++ b/ambari-metrics-timelineservice/src/test/java/org/apache/ambari/metrics/core/timeline/AbstractMiniHBaseClusterTest.java
@@ -93,7 +93,7 @@ protected static void setUpTestDriver(ReadOnlyProps serverProps, ReadOnlyProps c
     }
   }
 
-  private static String checkClusterInitialized(ReadOnlyProps serverProps) throws Exception {
+  protected static String checkClusterInitialized(ReadOnlyProps serverProps) throws Exception {
     if(!clusterInitialized) {
       url = setUpTestCluster(config, serverProps);
       clusterInitialized = true;