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/25 10:40:41 UTC
[ambari-metrics] branch master updated: AMBARI-25780 Ambari metrics should upgrade hadoop and hbase for known CVE issues (#77)
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 aedad58 AMBARI-25780 Ambari metrics should upgrade hadoop and hbase for known CVE issues (#77)
aedad58 is described below
commit aedad58bc58307254fc2961d246607e4bfe58f4f
Author: lucasbak <lu...@gmail.com>
AuthorDate: Fri Nov 25 11:40:36 2022 +0100
AMBARI-25780 Ambari metrics should upgrade hadoop and hbase for known CVE issues (#77)
---
ambari-metrics-timelineservice/pom.xml | 3 +--
.../records/impl/pb/ApplicationAttemptFinishDataPBImpl.java | 2 +-
.../records/impl/pb/ApplicationAttemptStartDataPBImpl.java | 2 +-
.../metrics/records/impl/pb/ApplicationFinishDataPBImpl.java | 2 +-
.../metrics/records/impl/pb/ApplicationStartDataPBImpl.java | 2 +-
.../metrics/records/impl/pb/ContainerFinishDataPBImpl.java | 2 +-
.../metrics/records/impl/pb/ContainerStartDataPBImpl.java | 2 +-
pom.xml | 10 +++++-----
8 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/ambari-metrics-timelineservice/pom.xml b/ambari-metrics-timelineservice/pom.xml
index 36c3ad9..3501ed4 100644
--- a/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics-timelineservice/pom.xml
@@ -34,9 +34,8 @@
<!-- 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.0.0-HBase-2.0</phoenix.version>
<phoenix.version>5.1.2</phoenix.version>
- <hbase.version>2.4.2</hbase.version>
+ <hbase.version>2.4.13</hbase.version>
</properties>
<build>
diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ApplicationAttemptFinishDataPBImpl.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ApplicationAttemptFinishDataPBImpl.java
index cb0e545..c04e5ff 100644
--- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ApplicationAttemptFinishDataPBImpl.java
+++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ApplicationAttemptFinishDataPBImpl.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.yarn.proto.YarnProtos.FinalApplicationStatusProto;
import org.apache.hadoop.yarn.proto.YarnProtos.YarnApplicationAttemptStateProto;
import org.apache.ambari.metrics.records.ApplicationAttemptFinishData;
-import com.google.protobuf.TextFormat;
+import org.apache.hadoop.thirdparty.protobuf.TextFormat;
public class ApplicationAttemptFinishDataPBImpl extends
ApplicationAttemptFinishData {
diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ApplicationAttemptStartDataPBImpl.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ApplicationAttemptStartDataPBImpl.java
index 6c76d3c..cbda0a6 100644
--- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ApplicationAttemptStartDataPBImpl.java
+++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ApplicationAttemptStartDataPBImpl.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.yarn.proto.YarnProtos.ApplicationAttemptIdProto;
import org.apache.hadoop.yarn.proto.YarnProtos.ContainerIdProto;
import org.apache.ambari.metrics.records.ApplicationAttemptStartData;
-import com.google.protobuf.TextFormat;
+import org.apache.hadoop.thirdparty.protobuf.TextFormat;
public class ApplicationAttemptStartDataPBImpl extends
ApplicationAttemptStartData {
diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ApplicationFinishDataPBImpl.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ApplicationFinishDataPBImpl.java
index ba7e7f0..ddc0c90 100644
--- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ApplicationFinishDataPBImpl.java
+++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ApplicationFinishDataPBImpl.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.yarn.proto.YarnProtos.FinalApplicationStatusProto;
import org.apache.hadoop.yarn.proto.YarnProtos.YarnApplicationStateProto;
import org.apache.ambari.metrics.records.ApplicationFinishData;
-import com.google.protobuf.TextFormat;
+import org.apache.hadoop.thirdparty.protobuf.TextFormat;
public class ApplicationFinishDataPBImpl extends ApplicationFinishData {
diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ApplicationStartDataPBImpl.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ApplicationStartDataPBImpl.java
index f47ab00..30152c4 100644
--- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ApplicationStartDataPBImpl.java
+++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ApplicationStartDataPBImpl.java
@@ -25,7 +25,7 @@ import org.apache.hadoop.yarn.proto.ApplicationHistoryServerProtos.ApplicationSt
import org.apache.hadoop.yarn.proto.ApplicationHistoryServerProtos.ApplicationStartDataProtoOrBuilder;
import org.apache.hadoop.yarn.proto.YarnProtos.ApplicationIdProto;
-import com.google.protobuf.TextFormat;
+import org.apache.hadoop.thirdparty.protobuf.TextFormat;
public class ApplicationStartDataPBImpl extends ApplicationStartData {
diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ContainerFinishDataPBImpl.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ContainerFinishDataPBImpl.java
index e9aeb92..2a61643 100644
--- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ContainerFinishDataPBImpl.java
+++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ContainerFinishDataPBImpl.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.yarn.proto.YarnProtos.ContainerIdProto;
import org.apache.hadoop.yarn.proto.YarnProtos.ContainerStateProto;
import org.apache.ambari.metrics.records.ContainerFinishData;
-import com.google.protobuf.TextFormat;
+import org.apache.hadoop.thirdparty.protobuf.TextFormat;
public class ContainerFinishDataPBImpl extends ContainerFinishData {
diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ContainerStartDataPBImpl.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ContainerStartDataPBImpl.java
index e7d0762..cf38a22 100644
--- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ContainerStartDataPBImpl.java
+++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/records/impl/pb/ContainerStartDataPBImpl.java
@@ -34,7 +34,7 @@ import org.apache.hadoop.yarn.proto.YarnProtos.NodeIdProto;
import org.apache.hadoop.yarn.proto.YarnProtos.PriorityProto;
import org.apache.hadoop.yarn.proto.YarnProtos.ResourceProto;
-import com.google.protobuf.TextFormat;
+import org.apache.hadoop.thirdparty.protobuf.TextFormat;
public class ContainerStartDataPBImpl extends ContainerStartData {
diff --git a/pom.xml b/pom.xml
index f8a32c2..4603b23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,13 +38,13 @@
<python.ver>python >= 2.6</python.ver>
<deb.python.ver>python (>= 2.6)</deb.python.ver>
<!--TODO change to HDP URL-->
- <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>
+ <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>
+ <hadoop.folder>hadoop-3.3.4</hadoop.folder>
+ <hadoop.version>3.3.4</hadoop.version>
<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>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ambari.apache.org
For additional commands, e-mail: commits-help@ambari.apache.org