You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by wu...@apache.org on 2022/11/17 10:00:21 UTC

[ambari-metrics] branch master updated: AMBARI-25717: Fix broken build due to HBase/Phoenix version (#74)

This is an automated email from the ASF dual-hosted git repository.

wuzhiguo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git


The following commit(s) were added to refs/heads/master by this push:
     new 245b66f  AMBARI-25717: Fix broken build due to HBase/Phoenix version (#74)
245b66f is described below

commit 245b66fe310ef279d8c15770f2bfd2b2a2687263
Author: Zhiguo Wu <wu...@apache.org>
AuthorDate: Thu Nov 17 18:00:16 2022 +0800

    AMBARI-25717: Fix broken build due to HBase/Phoenix version (#74)
---
 ambari-metrics-timelineservice/pom.xml                            | 6 +++---
 .../metrics/core/timeline/AbstractMiniHBaseClusterTest.java       | 2 +-
 pom.xml                                                           | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ambari-metrics-timelineservice/pom.xml b/ambari-metrics-timelineservice/pom.xml
index 0a840ab..36c3ad9 100644
--- a/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics-timelineservice/pom.xml
@@ -35,8 +35,8 @@
     <!--<yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>-->
     <protobuf.version>2.5.0</protobuf.version>
     <phoenix.version>5.0.0-HBase-2.0</phoenix.version>
-    <hbase.version>2.0.2</hbase.version>
-    <slf4j.version>2.0.0</slf4j.version>
+    <phoenix.version>5.1.2</phoenix.version>
+    <hbase.version>2.4.2</hbase.version>
   </properties>
 
   <build>
@@ -923,7 +923,7 @@
                         compression="gzip"
                     />
                     <move
-                        file="${project.build.directory}/embedded/${phoenix.folder}/phoenix-${phoenix.version}-server.jar"
+                        file="${project.build.directory}/embedded/${phoenix.folder}/phoenix-server-hbase-2.4-${phoenix.version}.jar"
                         tofile="${project.build.directory}/embedded/${hbase.folder}/lib/phoenix-${phoenix.version}-server.jar"
                     />
                   </target>
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 51e4b8a..0e7949c 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
@@ -133,7 +133,7 @@ public abstract class AbstractMiniHBaseClusterTest extends BaseTest {
   @AfterClass
   public static void doTeardown() throws Exception {
     dropNonSystemTables();
-    tearDownMiniCluster();
+    tearDownMiniCluster(1);
   }
 
   @Before
diff --git a/pom.xml b/pom.xml
index 8b5017f..f8a32c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,15 +38,15 @@
     <python.ver>python &gt;= 2.6</python.ver>
     <deb.python.ver>python (&gt;= 2.6)</deb.python.ver>
     <!--TODO change to HDP URL-->
-    <hbase.tar>https://archive.apache.org/dist/hbase/2.0.2/hbase-2.0.2-bin.tar.gz</hbase.tar>
-    <hbase.folder>hbase-2.0.2</hbase.folder>
+    <hbase.tar>https://archive.apache.org/dist/hbase/2.4.2/hbase-2.4.2-bin.tar.gz</hbase.tar>
+    <hbase.folder>hbase-2.4.2</hbase.folder>
     <hadoop.tar>https://archive.apache.org/dist/hadoop/common/hadoop-3.1.1/hadoop-3.1.1.tar.gz</hadoop.tar>
     <hadoop.folder>hadoop-3.1.1</hadoop.folder>
     <hadoop.version>3.1.1</hadoop.version>
     <grafana.folder>grafana-5.2.4</grafana.folder>
     <grafana.tar>https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.2.4.linux-amd64.tar.gz</grafana.tar>
-    <phoenix.tar>https://downloads.apache.org/phoenix/apache-phoenix-5.0.0-HBase-2.0/bin/apache-phoenix-5.0.0-HBase-2.0-bin.tar.gz</phoenix.tar>
-    <phoenix.folder>apache-phoenix-5.0.0-HBase-2.0-bin</phoenix.folder>
+    <phoenix.tar>https://downloads.apache.org/phoenix/phoenix-5.1.2/phoenix-hbase-2.4-5.1.2-bin.tar.gz</phoenix.tar>
+    <phoenix.folder>phoenix-hbase-2.4-5.1.2-bin</phoenix.folder>
     <resmonitor.install.dir>/usr/lib/python2.6/site-packages/resource_monitoring</resmonitor.install.dir>
     <powermock.version>1.6.2</powermock.version>
     <distMgmtSnapshotsId>apache.snapshots.https</distMgmtSnapshotsId>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ambari.apache.org
For additional commands, e-mail: commits-help@ambari.apache.org