Skip to content

Commit 0f94ab5

Browse files
authored
HBASE-26572 Upgrade to log4j 2.16.0 (#3943)
Signed-off-by: Duo Zhang <[email protected]> Signed-off-by: Pankaj Kumar <[email protected]>
1 parent 13f3b17 commit 0f94ab5

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

bin/hbase-config.cmd

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,6 @@ if exist "%HBASE_CONF_DIR%\hbase-env.cmd" (
6767
call "%HBASE_CONF_DIR%\hbase-env.cmd"
6868
)
6969

70-
@rem Disable the JNDI. This feature has critical REC vulnerability.
71-
@rem when 2.x <= log4j.version <= 2.14.1
72-
set HBASE_OPTS=%HBASE_OPTS% -Dlog4j2.formatMsgNoLookups=true
73-
7470
if not defined JAVA_HOME (
7571
echo Warning: JAVA_HOME environment variable is not set. Defaulting to c:\apps\java
7672
set JAVA_HOME=c:\apps\java

bin/hbase-config.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,7 @@ fi
162162
# memory usage to explode. Tune the variable down to prevent vmem explosion.
163163
export MALLOC_ARENA_MAX=${MALLOC_ARENA_MAX:-4}
164164

165-
# Disable the JNDI. This feature has critical REC vulnerability
166-
# when 2.x <= log4j.version <= 2.14.1
167-
export HBASE_OPTS="$HBASE_OPTS -Dlog4j2.formatMsgNoLookups=true"
168-
169-
# Now having JAVA_HOME defined is required
165+
# Now having JAVA_HOME defined is required
170166
if [ -z "$JAVA_HOME" ]; then
171167
cat 1>&2 <<EOF
172168
+======================================================================+

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1746,7 +1746,7 @@
17461746
<hamcrest.version>1.3</hamcrest.version>
17471747
<opentelemetry.version>1.0.1</opentelemetry.version>
17481748
<opentelemetry-javaagent.version>1.0.1</opentelemetry-javaagent.version>
1749-
<log4j2.version>2.15.0</log4j2.version>
1749+
<log4j2.version>2.16.0</log4j2.version>
17501750
<mockito-core.version>2.28.2</mockito-core.version>
17511751
<protobuf.plugin.version>0.6.1</protobuf.plugin.version>
17521752
<thrift.path>thrift</thrift.path>

0 commit comments

Comments
 (0)