Skip to content

HADOOP-18088. Replace log4j 1.x with reload4j. (#4052) #6547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

steveloughran
Copy link
Contributor

Cherrypick of two patches from branch-3.3, as the 3.4/trunk branches are still on log4j 1.x

HADOOP-18088. Replace log4j 1.x with reload4j. (#4052)
HADOOP-18354. Upgrade reload4j to 1.22.2 due to XXE vulnerability (#4635

Compilation works; lets see what yetus says.

I'm also doing local release build to make sure there are no log4j 2 artifacts being pulled in as part of dependencies -looks like mockito-core and cosmos-db pull them in somehow

For code changes:

  • Does the title or this PR starts with the corresponding JIRA issue id (e.g. 'HADOOP-17799. Your PR title ...')?
  • Object storage: have the integration tests been executed and the endpoint declared according to the connector-specific documentation?
  • If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
  • If applicable, have you updated the LICENSE, LICENSE-binary, NOTICE-binary files?

iwasakims and others added 2 commits February 12, 2024 16:38
Change-Id: I7aa29cdbe66e3eabcff5d30f244c55563a6dfa7f
Co-authored-by: Wei-Chiu Chuang <weichiu@apache.org>
…ache#4607). Contributed by PJ Fanning.

Change-Id: Ic77cf8ea0f36f43a4e7d46b7e866121581d3483e
Signed-off-by: Ayush Saxena <ayushsaxena@apache.org>
@steveloughran
Copy link
Contributor Author

full clean build with this and there are no log4j jars on the classpath

> find hadoop-dist/target/hadoop-3.5.0-SNAPSHOT -print | grep log

hadoop-dist/target/hadoop-3.5.0-SNAPSHOT/libexec/tools/hadoop-archive-logs.sh
hadoop-dist/target/hadoop-3.5.0-SNAPSHOT/libexec/shellprofile.d/hadoop-archive-logs.sh
hadoop-dist/target/hadoop-3.5.0-SNAPSHOT/etc/hadoop/httpfs-log4j.properties
hadoop-dist/target/hadoop-3.5.0-SNAPSHOT/etc/hadoop/kms-log4j.properties
hadoop-dist/target/hadoop-3.5.0-SNAPSHOT/etc/hadoop/yarnservice-log4j.properties
hadoop-dist/target/hadoop-3.5.0-SNAPSHOT/etc/hadoop/log4j.properties
hadoop-dist/target/hadoop-3.5.0-SNAPSHOT/share/hadoop/tools/lib/hadoop-archive-logs-3.5.0-SNAPSHOT.jar
hadoop-dist/target/hadoop-3.5.0-SNAPSHOT/share/hadoop/tools/sources/hadoop-archive-logs-3.5.0-SNAPSHOT-test-sources.jar
hadoop-dist/target/hadoop-3.5.0-SNAPSHOT/share/hadoop/tools/sources/hadoop-archive-logs-3.5.0-SNAPSHOT-sources.jar
hadoop-dist/target/hadoop-3.5.0-SNAPSHOT/share/hadoop/tools/sls/sample-conf/log4j.properties
hadoop-dist/target/hadoop-3.5.0-SNAPSHOT/share/hadoop/yarn/yarn-service-examples/appcatalog
hadoop-dist/target/hadoop-3.5.0-SNAPSHOT/share/hadoop/yarn/yarn-service-examples/appcatalog/appcatalog.json
hadoop-dist/target/hadoop-3.5.0-SNAPSHOT/share/hadoop/yarn/hadoop-yarn-applications-catalog-webapp-3.5.0-SNAPSHOT.war
hadoop-dist/target/hadoop-3.5.0-SNAPSHOT/share/hadoop/common/lib/commons-logging-1.1.3.jar
hadoop-dist/target/hadoop-3.5.0-SNAPSHOT/share/hadoop/hdfs/lib/commons-logging-1.1.3.jar

@steveloughran
Copy link
Contributor Author

Incidentally, as this is a backport I don't need a vote from anyone but myself :-)

just making sure it is good

Change-Id: I5fcd0588ee4bc37855f8c0af8afb79ede77939bd
Change-Id: I33dda16995faa25501fb0923e39ab74d9fe22151
@steveloughran steveloughran merged commit 095dfcc into apache:trunk Feb 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants