Skip to content

Commit 9bae50f

Browse files
authored
HBASE-27141 Upgrade hbase-thirdparty dependency to 4.1.1 (#4552)
Signed-off-by: Andrew Purtell <[email protected]> Signed-off-by: Pankaj Kumar <[email protected]>
1 parent de80493 commit 9bae50f

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,10 @@ public class HttpServer implements FilterContainer {
108108
private static final Logger LOG = LoggerFactory.getLogger(HttpServer.class);
109109
private static final String EMPTY_STRING = "";
110110

111-
private static final int DEFAULT_MAX_HEADER_SIZE = 64 * 1024; // 64K
111+
// Jetty's max header size is Character.MAX_VALUE - 1, See ArrayTernaryTrie for more details
112+
// And in newer jetty version, they add a check when creating a server so we must follow this
113+
// limitation otherwise the UTs will fail
114+
private static final int DEFAULT_MAX_HEADER_SIZE = Character.MAX_VALUE - 1;
112115

113116
static final String FILTER_INITIALIZERS_PROPERTY = "hbase.http.filter.initializers";
114117
static final String HTTP_MAX_THREADS = "hbase.http.max.threads";

hbase-http/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class JSONBean {
5757
private static final String COMMA = ",";
5858
private static final String ASTERICK = "*";
5959
private static final Logger LOG = LoggerFactory.getLogger(JSONBean.class);
60-
private static final Gson GSON = GsonUtil.createGson().create();
60+
private static final Gson GSON = GsonUtil.createGsonWithDisableHtmlEscaping().create();
6161

6262
/**
6363
* Use dumping out mbeans as JSON.

hbase-protocol-shaded/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<!--Version of protobuf that hbase uses internally (we shade our pb)
3535
Must match what is out in hbase-thirdparty include.
3636
-->
37-
<internal.protobuf.version>3.17.3</internal.protobuf.version>
37+
<internal.protobuf.version>3.21.1</internal.protobuf.version>
3838
</properties>
3939
<dependencies>
4040
<!--BE CAREFUL! Any dependency added here needs to be

hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/Constants.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ public final class Constants {
2727
private Constants() {
2828
}
2929

30-
public static final int DEFAULT_HTTP_MAX_HEADER_SIZE = 64 * 1024; // 64k
30+
// Jetty's max header size is Character.MAX_VALUE - 1, See ArrayTernaryTrie for more details
31+
// And in newer jetty version, they add a check when creating a server so we must follow this
32+
// limitation otherwise the UTs will fail
33+
public static final int DEFAULT_HTTP_MAX_HEADER_SIZE = Character.MAX_VALUE - 1;
3134

3235
public static final String SERVER_TYPE_CONF_KEY = "hbase.regionserver.thrift.server.type";
3336

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -792,8 +792,8 @@
792792
<httpclient.version>4.5.13</httpclient.version>
793793
<httpcore.version>4.4.13</httpcore.version>
794794
<metrics-core.version>3.2.6</metrics-core.version>
795-
<jackson.version>2.13.1</jackson.version>
796-
<jackson.databind.version>2.13.1</jackson.databind.version>
795+
<jackson.version>2.13.3</jackson.version>
796+
<jackson.databind.version>2.13.3</jackson.databind.version>
797797
<jaxb-api.version>2.3.1</jaxb-api.version>
798798
<servlet.api.version>3.1.0</servlet.api.version>
799799
<wx.rs.api.version>2.1.1</wx.rs.api.version>
@@ -860,7 +860,7 @@
860860
<snappy.version>1.1.8.4</snappy.version>
861861
<xz.version>1.9</xz.version>
862862
<zstd-jni.version>1.5.0-4</zstd-jni.version>
863-
<hbase-thirdparty.version>4.1.0</hbase-thirdparty.version>
863+
<hbase-thirdparty.version>4.1.1</hbase-thirdparty.version>
864864
<!-- Intraproject jar naming properties -->
865865
<!-- TODO this is pretty ugly, but works for the moment.
866866
Modules are pretty heavy-weight things, so doing this work isn't too bad. -->

0 commit comments

Comments
 (0)