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

build: Switch from JMockit to Mockito & build target to Java 11 #6922

Merged
merged 9 commits into from
Sep 7, 2024

Conversation

aikebah
Copy link
Collaborator

@aikebah aikebah commented Aug 26, 2024

Fixes Issue #6809

Description of Change

Change mocking in the testcases from JMockit ot Mockito and update the compiler-target to Java 11.
Because of the bump in required Java version also updated the version to the next major as from this change onward Java 11 will be required to run DependencyCheck (some of the mocking required Mockito 5 which also requires Java 11)

One testcase, that was already dynamically disabled on Java 8 has been removed now, as I could not find a way to return it to operational state.

Have test cases been added to cover the new functionality?

No new functionality, only a replacement of a mocking framework in the test cases and a bump in Java version

@boring-cyborg boring-cyborg bot added ant changes to ant cli changes to the cli core changes to core maven changes to the maven plugin tests test cases utils changes to utils labels Aug 26, 2024
@aikebah aikebah changed the title Switch from JMockit to Mockito & build target to Java 11 build: Switch from JMockit to Mockito & build target to Java 11 Aug 26, 2024
@aikebah aikebah added this to the 11.0.0 milestone Aug 26, 2024
@aikebah
Copy link
Collaborator Author

aikebah commented Aug 26, 2024

@jeremylong you may want to release a 10.x bugfix with the latest changes since 10.0.3 before integrating as this PR also switches minimum java version used at runtime to Java 11.

@jeremylong
Copy link
Owner

There will be other breaking changes in 11.0 - so yes, I was planning on another release before merging the breaking changes.

@aikebah
Copy link
Collaborator Author

aikebah commented Aug 27, 2024

There will be other breaking changes in 11.0 - so yes, I was planning on another release before merging the breaking changes.

Created a new 10.0.4 milestone and re-targeted the already merged PRs to that milestone, so that the 11.0.0 milestone now only has the unmerged, breaking, changes allocated

Copy link
Owner

@jeremylong jeremylong left a comment

Choose a reason for hiding this comment

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

LGTM

@aikebah aikebah linked an issue Aug 28, 2024 that may be closed by this pull request
Copy link
Owner

@jeremylong jeremylong left a comment

Choose a reason for hiding this comment

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

LGTM

@jeremylong jeremylong merged commit ecc6e2e into main Sep 7, 2024
6 checks passed
@jeremylong jeremylong deleted the issue-6809 branch September 7, 2024 11:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ant changes to ant cli changes to the cli core changes to core maven changes to the maven plugin tests test cases utils changes to utils
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Change mocking framework to be Java 11+ compatible
2 participants