Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions bin/hbase-config.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ if exist "%HBASE_CONF_DIR%\hbase-env.cmd" (
call "%HBASE_CONF_DIR%\hbase-env.cmd"
)

@rem Disable the JNDI. This feature has critical REC vulnerability.
@rem when 2.x <= log4j.version <= 2.14.1
set HBASE_OPTS=%HBASE_OPTS% -Dlog4j2.formatMsgNoLookups=true

if not defined JAVA_HOME (
echo Warning: JAVA_HOME environment variable is not set. Defaulting to c:\apps\java
set JAVA_HOME=c:\apps\java
Expand Down
6 changes: 1 addition & 5 deletions bin/hbase-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,7 @@ fi
# memory usage to explode. Tune the variable down to prevent vmem explosion.
export MALLOC_ARENA_MAX=${MALLOC_ARENA_MAX:-4}

# Disable the JNDI. This feature has critical REC vulnerability
# when 2.x <= log4j.version <= 2.14.1
export HBASE_OPTS="$HBASE_OPTS -Dlog4j2.formatMsgNoLookups=true"

# Now having JAVA_HOME defined is required
# Now having JAVA_HOME defined is required
if [ -z "$JAVA_HOME" ]; then
cat 1>&2 <<EOF
+======================================================================+
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1746,7 +1746,7 @@
<hamcrest.version>1.3</hamcrest.version>
<opentelemetry.version>1.0.1</opentelemetry.version>
<opentelemetry-javaagent.version>1.0.1</opentelemetry-javaagent.version>
<log4j2.version>2.15.0</log4j2.version>
<log4j2.version>2.16.0</log4j2.version>
<mockito-core.version>2.28.2</mockito-core.version>
<protobuf.plugin.version>0.6.1</protobuf.plugin.version>
<thrift.path>thrift</thrift.path>
Expand Down