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.

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

Upgrade Mockito to Java 21 compatible version #80

Merged
merged 4 commits into from Sep 14, 2023

Conversation

basil
Copy link
Member

@basil basil commented Aug 23, 2023

Reduces usages of PowerMock to just the powermock-reflect library, allowing us to upgrade Mockito to the latest version and also to upgrade to the latest parent POM, which in turn unblocks Java 21 support. While I was here I also sorted the dependencies for legibility.

@basil basil requested a review from a team as a code owner August 23, 2023 16:26
pom.xml Outdated
<configuration>
<!-- TODO fails on CI on Windows for inscrutable reasons -->
<excludes>
<exclude>org.jenkinsci.plugins.mailwatcher.NodeStatusTest</exclude>
Copy link
Member

Choose a reason for hiding this comment

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

Prefer adding junit assumption testing the platform to the test itself. It is a oneliner...

Copy link
Member Author

Choose a reason for hiding this comment

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

As a courtesy, I have accommodated your preference in commit 0815db8.

In the future, I would prefer to understand the reasoning behind requests that are made of me in code reviews.

Copy link
Member

Choose a reason for hiding this comment

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

Fair enough. I find this beneficial as the fact the test is platform dependent is in the eyes of the test developer - colocated with the platform dependent code. When stated in the pom file only, it can let one wander how the code they are looking at is supposed to run on platform X.

@basil
Copy link
Member Author

basil commented Sep 5, 2023

@olivergondza Gentle ping. Would be good to get this merged/released to facilitate Java 21 platform support

@olivergondza olivergondza merged commit 517d2d5 into jenkinsci:master Sep 14, 2023
16 checks passed
@olivergondza
Copy link
Member

Thanks for the fix, @basil.

@basil basil deleted the powermock branch September 14, 2023 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants