Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Upgrade 2.x compiler baseline to Java 17 #2021

Merged
merged 29 commits into from
Dec 1, 2023
Merged

Upgrade 2.x compiler baseline to Java 17 #2021

merged 29 commits into from
Dec 1, 2023

Conversation

vy
Copy link
Member

@vy vy commented Nov 30, 2023

Warning! revision needs to be adjusted prior to merge.

vy added 18 commits November 29, 2023 15:32
@vy
Bump the compiler to Java 17
19e4b35
@vy
Temporarily change the version to ease local testing
70e570f
@vy
Fix Java 17 failures in NoopThreadContextTest
0ddcdb8
@vy
Fix Java 17 failures in DefaultThreadContextMapTest
367a2b6
@vy
Fix Java 17 failures in ThreadContextInheritanceTest
1e1a1f4
@vy
Add Nashorn JavaScript engine for tests
7f0a6ae 
JEP-335 has deprecated Nashorn in Java 11, and JEP-372
removed it in Java 15.
@vy
Remove final from CLOCK of AsyncLogger and Log4jLogEvent
4c2c17e 
This is necessary for Java 12+ compatibility.
@vy
Relax reflective access for Java 17 compatibility
3f55092
@vy
Refactor DatePatternConverterTest for Java 17 compatibility
1d26d96
@vy
Formatting fixes
f64394d
@vy
Reflective access fixes
dfa8558
@vy
Merge remote-tracking branch 'origin/2.x' into 2.x-java-17
d7db79d
@vy
Reflective access fixes for log4j-osgi-test
2e0411f
@vy
Merge remote-tracking branch 'origin/2.x-java-17' into 2.x-java-17
b805c94
@vy
Upgrade json-unit
dce93ef
@vy
Upgrade junit-pioneer
d5a20c1
@vy
Upgrade org.mockito:*
7569495
@vy
Upgrade system-stubs
c03eb85
@vy vy added the enhancement Additions or updates to features label Nov 30, 2023
@vy vy self-assigned this Nov 30, 2023
@vy vy added this to the 2.23.0 milestone Nov 30, 2023
ppkarwasz
ppkarwasz requested changes Nov 30, 2023
View reviewed changes
Copy link
Contributor

@ppkarwasz ppkarwasz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vy,

Great job.

Some deps must however be downgraded, since tests must be runnable also on Java 8.

.github/dependabot.yaml Outdated Show resolved Hide resolved
.github/dependabot.yaml Outdated Show resolved Hide resolved
.github/dependabot.yaml Outdated Show resolved Hide resolved
...e-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTestBase.java Outdated Show resolved Hide resolved
ppkarwasz
ppkarwasz approved these changes Dec 1, 2023
View reviewed changes
Copy link
Contributor

@ppkarwasz ppkarwasz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@vy
Copy link
Member Author

vy commented Dec 1, 2023

Some deps must however be downgraded, since tests must be runnable also on Java 8.

Thanks so much for the review, much appreciated! 🙏 I have reverted test dependency upgrades. I will merge the changes sometime today.

@vy vy merged commit 6b9d122 into 2.x Dec 1, 2023
3 of 8 checks passed
@vy vy deleted the 2.x-java-17 branch December 1, 2023 21:41
@vy vy mentioned this pull request Dec 5, 2023
Closed
@ppkarwasz ppkarwasz mentioned this pull request Dec 15, 2023
Closed
@ppkarwasz ppkarwasz modified the milestones: 2.23.0, 2.22.1 Dec 15, 2023
@venusdrogon venusdrogon mentioned this pull request Jan 16, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ppkarwasz ppkarwasz ppkarwasz approved these changes

Assignees

@vy vy

Labels
enhancement Additions or updates to features
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@vy @ppkarwasz