HBASE-27141 Upgrade hbase-thirdparty dependency to 4.1.1 (#4552)
Signed-off-by: Andrew Purtell <apurtell@apache.org>
Signed-off-by: Pankaj Kumar <pankajkumar@apache.org>
(cherry picked from commit 9bae50f83c6c300d8952527bece28c3d2c13e179)
Conflicts:
pom.xml
diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java
index d2437a1..8b4890f 100644
--- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java
+++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java
@@ -107,7 +107,10 @@
private static final Logger LOG = LoggerFactory.getLogger(HttpServer.class);
private static final String EMPTY_STRING = "";
- private static final int DEFAULT_MAX_HEADER_SIZE = 64 * 1024; // 64K
+ // Jetty's max header size is Character.MAX_VALUE - 1, See ArrayTernaryTrie for more details
+ // And in newer jetty version, they add a check when creating a server so we must follow this
+ // limitation otherwise the UTs will fail
+ private static final int DEFAULT_MAX_HEADER_SIZE = Character.MAX_VALUE - 1;
static final String FILTER_INITIALIZERS_PROPERTY = "hbase.http.filter.initializers";
static final String HTTP_MAX_THREADS = "hbase.http.max.threads";
diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java
index 9a9761a..970ec54 100644
--- a/hbase-http/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java
+++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java
@@ -57,7 +57,7 @@
private static final String COMMA = ",";
private static final String ASTERICK = "*";
private static final Logger LOG = LoggerFactory.getLogger(JSONBean.class);
- private static final Gson GSON = GsonUtil.createGson().create();
+ private static final Gson GSON = GsonUtil.createGsonWithDisableHtmlEscaping().create();
/**
* Use dumping out mbeans as JSON.
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index 88c17cd..423f8d9 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.17.3</internal.protobuf.version>
+ <internal.protobuf.version>3.21.1</internal.protobuf.version>
</properties>
<dependencies>
<!--BE CAREFUL! Any dependency added here needs to be
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/Constants.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/Constants.java
index 8eb1fef..83bb90e 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/Constants.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/Constants.java
@@ -27,7 +27,10 @@
private Constants() {
}
- public static final int DEFAULT_HTTP_MAX_HEADER_SIZE = 64 * 1024; // 64k
+ // Jetty's max header size is Character.MAX_VALUE - 1, See ArrayTernaryTrie for more details
+ // And in newer jetty version, they add a check when creating a server so we must follow this
+ // limitation otherwise the UTs will fail
+ public static final int DEFAULT_HTTP_MAX_HEADER_SIZE = Character.MAX_VALUE - 1;
public static final String SERVER_TYPE_CONF_KEY = "hbase.regionserver.thrift.server.type";
diff --git a/pom.xml b/pom.xml
index 4b78a6e..ddce17c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -564,8 +564,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.1</jackson.version>
- <jackson.databind.version>2.13.1</jackson.databind.version>
+ <jackson.version>2.13.3</jackson.version>
+ <jackson.databind.version>2.13.3</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>
@@ -625,7 +625,7 @@
<wagon.ssh.version>2.12</wagon.ssh.version>
<xml.maven.version>1.0.1</xml.maven.version>
<spotless.version>2.22.2</spotless.version>
- <hbase-thirdparty.version>4.1.0</hbase-thirdparty.version>
+ <hbase-thirdparty.version>4.1.1</hbase-thirdparty.version>
<maven-site.version>3.12.0</maven-site.version>
<!-- Intraproject jar naming properties -->
<!-- TODO this is pretty ugly, but works for the moment.
