Skip to content

[CALCITE-7577] Upgrade log4j to 2.25.4 from 2.17.1#4987

Merged
mihaibudiu merged 1 commit into
apache:mainfrom
lawlie8:log4j-main
Jun 3, 2026
Merged

[CALCITE-7577] Upgrade log4j to 2.25.4 from 2.17.1#4987
mihaibudiu merged 1 commit into
apache:mainfrom
lawlie8:log4j-main

Conversation

@lawlie8
Copy link
Copy Markdown
Contributor

@lawlie8 lawlie8 commented Jun 3, 2026

Jira Link

CALCITE-7577

Changes Proposed

Upgrade log4j to 2.25.4

@lawlie8
Copy link
Copy Markdown
Contributor Author

lawlie8 commented Jun 3, 2026

ran
calcite-test

Local Build + Tests

@xiedeyantu
Copy link
Copy Markdown
Member

org.apache.calcite.test.LintTest > testLintLog() failure marker
FAILURE   0.1sec, org.apache.calcite.test.LintTest > testLintLog()
    java.lang.AssertionError: 
    Expected: an empty collection
         but: <[invalid git log message '[CALCITE-7577] Upgrade log4j to 2.25.4 to fix CVE-2025-68161'; contains 'fix' or 'fixes'; you should describe the problem, not what you did]>
        at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:18)
        at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:6)
        at org.apache.calcite.test.LintTest.testLintLog(LintTest.java:381)

You should remove 'fix' from your RP title. And JIRA title and commit message should be same as PR title.

@lawlie8 lawlie8 changed the title [CALCITE-7577] Upgrade log4j to 2.25.4 to fix CVE-2025-68161 [CALCITE-7577] Upgrade log4j to 2.25.4 from 2.17.1 Jun 3, 2026
@mihaibudiu mihaibudiu added the LGTM-will-merge-soon Overall PR looks OK. Only minor things left. label Jun 3, 2026
@mihaibudiu mihaibudiu merged commit 235aeec into apache:main Jun 3, 2026
32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

LGTM-will-merge-soon Overall PR looks OK. Only minor things left.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants