diff --git a/ambari-metrics-assembly/pom.xml b/ambari-metrics-assembly/pom.xml
index 8f26a5e7..74375cbc 100644
--- a/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics-assembly/pom.xml
@@ -220,8 +220,6 @@
*tests.jar
findbugs*.jar
jdk.tools*.jar
- hadoop*.jar
- hbase*.jar
@@ -229,13 +227,6 @@
${collector.dir}/target/ambari-metrics-timelineservice-${project.version}.jar
-
- ${collector.dir}/target/embedded/${hbase.folder}/lib
-
- hadoop*.jar
- hbase*.jar
-
-
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 @@
commons-io
commons-io
- 2.4
+ 2.8.0
com.google.code.gson
@@ -103,7 +103,6 @@
com.google.guava
guava
- 28.0-jre
org.apache.curator
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.
com.google.guava
guava
- 18.0
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.
commons-io
commons-io
- 2.1
+ 2.8.0
compile
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 @@
com.google.guava
guava
- 18.0
org.apache.ambari
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 @@
org.apache.hadoop
hadoop-annotations
+
+ org.apache.hadoop
+ hadoop-hdfs-client
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-core
+
+
+ hbase-mapreduce
+ org.apache.hbase
+
+
+ hbase-hadoop-compat
+ org.apache.hbase
+
+
+ hbase-hadoop2-compat
+ org.apache.hbase
+
+
+ hbase-common
+ org.apache.hbase
+
+
+ hbase-protocol
+ org.apache.hbase
+
+
+ hbase-protocol-shaded
+ org.apache.hbase
+
+
+ hbase-metrics-api
+ org.apache.hbase
+
+
+ hbase-zookeeper
+ org.apache.hbase
+
+
+ hbase-shaded-miscellaneous
+ org.apache.hbase.thirdparty
+
+
+ hbase-shaded-protobuf
+ org.apache.hbase.thirdparty
+
com.fasterxml.jackson.core
jackson-databind
@@ -342,6 +390,62 @@
+
+ org.apache.hadoop
+ hadoop-client
+ ${hadoop.version}
+
+
+ org.apache.hadoop
+ hadoop-hdfs
+ ${hadoop.version}
+
+
+ org.apache.hadoop
+ hadoop-minicluster
+ ${hadoop.version}
+
+
+ org.apache.hadoop
+ hadoop-auth
+ ${hadoop.version}
+
+
+ org.apache.hadoop
+ hadoop-distcp
+ ${hadoop.version}
+
+
+ org.apache.hbase
+ hbase-server
+ ${hbase.version}
+
+
+ javax.ws.rs
+ javax.ws.rs-api
+
+
+
+
+ org.apache.hbase
+ hbase-client
+ ${hbase.version}
+
+
+ org.apache.hbase
+ hbase-mapreduce
+ ${hbase.version}
+
+
+ org.apache.hbase
+ hbase-metrics
+ ${hbase.version}
+
+
+ sqlline
+ sqlline
+ 1.9.0
+
org.apache.phoenix
phoenix-hbase-compat-2.4.1
@@ -524,7 +628,6 @@
com.google.guava
guava
- 28.0-jre
commons-logging
@@ -539,7 +642,7 @@
commons-io
commons-io
- 2.4
+ 2.8.0
org.apache.commons
@@ -788,6 +891,10 @@
com.fasterxml.jackson.core
jackson-databind
+
+ org.apache.hadoop
+ hadoop-minicluster
+
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;
diff --git a/pom.xml b/pom.xml
index 8aadd332..4a26227d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,21 +38,21 @@
python3 >= 3.0
python3 (>= 3.0)
2.0.0
- 3.5.9
- 2.8.1
- 5.1.2
- 2.4.13
+ 3.7.2
+ 2.8.2
+ 5.1.3
+ 2.4.17
4.2.0
3.12.0
- 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-2.4.13
- 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-3.3.4
- 3.3.4
+ https://archive.apache.org/dist/hbase/2.4.17/hbase-2.4.17-bin.tar.gz
+ hbase-2.4.17
+ https://archive.apache.org/dist/hadoop/common/hadoop-3.3.6/hadoop-3.3.6.tar.gz
+ hadoop-3.3.6
+ 3.3.6
grafana-v11.1.4
https://dl.grafana.com/oss/release/grafana-11.1.4.linux-amd64.tar.gz
- 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-hbase-2.4-5.1.2-bin
+ https://archive.apache.org/dist/phoenix/phoenix-5.1.3/phoenix-hbase-2.4-5.1.3-bin.tar.gz
+ phoenix-hbase-2.4-5.1.3-bin
/usr/lib/python3.9/site-packages/resource_monitoring
1.6.2
apache.snapshots.https
@@ -133,7 +133,7 @@
com.google.guava
guava
- 28.0-jre
+ 32.1.1-jre