You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2022/11/17 14:30:22 UTC
[hbase] branch branch-2 updated (43b1c9722b8 -> 309ed58f07b)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a change to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
from 43b1c9722b8 HBASE-27379 fix numOpenConnections metric is one less than the actual (#4884)
new 8b2c7b1b495 HBASE-27423 Upgrade hbase-thirdparty to 4.1.3 and upgrade Jackson for CVE-2022-42003/42004 (#4878)
new 309ed58f07b HBASE-27479 fix flaky test testClone in TestTaskMonitor (#4876)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
hbase-protocol-shaded/pom.xml | 2 +-
hbase-server/pom.xml | 5 +++++
.../org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java | 3 ++-
pom.xml | 13 ++++++++++---
4 files changed, 18 insertions(+), 5 deletions(-)
[hbase] 01/02: HBASE-27423 Upgrade hbase-thirdparty to 4.1.3 and upgrade Jackson for CVE-2022-42003/42004 (#4878)
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 8b2c7b1b49592b9b696378f1d4767bef07cfaa06
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Thu Nov 17 21:10:09 2022 +0800
HBASE-27423 Upgrade hbase-thirdparty to 4.1.3 and upgrade Jackson for CVE-2022-42003/42004 (#4878)
Signed-off-by: Xin Sun <dd...@gmail.com>
(cherry picked from commit 07a3ffdd97f22b7c1cf4dbfe23a029bec2b28336)
---
hbase-protocol-shaded/pom.xml | 2 +-
pom.xml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index 78581c5a676..bd2c48cea5a 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -34,7 +34,7 @@
<!--Version of protobuf that hbase uses internally (we shade our pb)
Must match what is out in hbase-thirdparty include.
-->
- <internal.protobuf.version>3.21.7</internal.protobuf.version>
+ <internal.protobuf.version>3.21.9</internal.protobuf.version>
</properties>
<dependencies>
<!--BE CAREFUL! Any dependency added here needs to be
diff --git a/pom.xml b/pom.xml
index 1884a595f7a..e4675e0a4c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -574,8 +574,8 @@
<httpclient.version>4.5.13</httpclient.version>
<httpcore.version>4.4.13</httpcore.version>
<metrics-core.version>3.2.6</metrics-core.version>
- <jackson.version>2.13.4</jackson.version>
- <jackson.databind.version>2.13.4</jackson.databind.version>
+ <jackson.version>2.14.0</jackson.version>
+ <jackson.databind.version>2.14.0</jackson.databind.version>
<jaxb-api.version>2.3.1</jaxb-api.version>
<servlet.api.version>3.1.0</servlet.api.version>
<wx.rs.api.version>2.1.1</wx.rs.api.version>
@@ -644,7 +644,7 @@
<snappy.version>1.1.8.4</snappy.version>
<xz.version>1.9</xz.version>
<zstd-jni.version>1.5.0-4</zstd-jni.version>
- <hbase-thirdparty.version>4.1.2</hbase-thirdparty.version>
+ <hbase-thirdparty.version>4.1.3</hbase-thirdparty.version>
<!-- Intraproject jar naming properties -->
<!-- TODO this is pretty ugly, but works for the moment.
Modules are pretty heavy-weight things, so doing this work isn't too bad. -->
[hbase] 02/02: HBASE-27479 fix flaky test testClone in TestTaskMonitor (#4876)
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 309ed58f07bb16f4e1bebd4a2f6f4afa35aaa52a
Author: YiweiLi4 <70...@users.noreply.github.com>
AuthorDate: Thu Nov 17 07:10:53 2022 -0600
HBASE-27479 fix flaky test testClone in TestTaskMonitor (#4876)
Signed-off-by: Duo Zhang <zh...@apache.org>
(cherry picked from commit a2075f51a84676c4fac7eb697a21255abddf143a)
---
hbase-server/pom.xml | 5 +++++
.../java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java | 3 ++-
pom.xml | 7 +++++++
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 21aa37bc2ad..7a18fdcfd06 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -351,6 +351,11 @@
<artifactId>bcpkix-jdk15on</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.skyscreamer</groupId>
+ <artifactId>jsonassert</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<!-- Make sure resources get added before they are processed by placing this first
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
index f7623c4d803..70c601c71a9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
@@ -38,6 +38,7 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.skyscreamer.jsonassert.JSONAssert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -238,7 +239,7 @@ public class TestTaskMonitor {
assertEquals(clone.getStatus(), monitor.getStatus());
assertEquals(clone.toString(), monitor.toString());
assertEquals(clone.toMap(), monitor.toMap());
- assertEquals(clone.toJSON(), monitor.toJSON());
+ JSONAssert.assertEquals(clone.toJSON(), monitor.toJSON(), true);
// mark complete and make param dirty
monitor.markComplete("complete RPC");
diff --git a/pom.xml b/pom.xml
index e4675e0a4c9..b1270373eba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -606,6 +606,7 @@
<jcodings.version>1.0.56</jcodings.version>
<spy.version>2.12.2</spy.version>
<bouncycastle.version>1.70</bouncycastle.version>
+ <skyscreamer.version>1.5.1</skyscreamer.version>
<kerby.version>1.0.1</kerby.version>
<commons-crypto.version>1.1.0</commons-crypto.version>
<curator.version>4.2.0</curator.version>
@@ -1361,6 +1362,12 @@
<version>${bouncycastle.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.skyscreamer</groupId>
+ <artifactId>jsonassert</artifactId>
+ <version>${skyscreamer.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>