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

Backport build changes from master to the 2.3.x branch #926

Open
wants to merge 6 commits into
base: QFJ_2_3_x
Choose a base branch
from

Conversation

gtoison
Copy link

@gtoison gtoison commented Jan 9, 2025

Hello @chrjohn, thank you for starting the release of 2.3.2!
I've noticed that the build failed because branch 2.3.x is not up to date with the recent changes, in particular upgrading from Java 15 to Java 17 and from Windows-2016 to Windows latest.

I've backported the latest build from master to the 2.3.x to restore the build, so it also needs the Maven wrapper.
This also entails upgrading Mockito to a version compatible with Java 17.

gtoison and others added 6 commits January 9, 2025 13:53
moved Xms/Xmx to jvm.config
* update mockito to check for better JDK17 support
* Replaced `stub()` by `when()`.
* Changed Mockito matchers since they no longer match `null`.
* added --add-opens to prevent test failure
* Added profile for surefire on JDK8 and other JDKs
@chrjohn
Copy link
Member

chrjohn commented Jan 9, 2025

Hi @gtoison thanks, I wanted to skip this part since 2.3.2 will be the last 2.3.x release, so I only built and tested locally.
Could you do me a favour and create a separate PR with the workflow changes only and let it use mvn instead of mvnw? There are changes in the workflow which were introduced by changes in 3.0.0 that are not part of the 2.3.x release.

@gtoison
Copy link
Author

gtoison commented Jan 9, 2025

Sure, I was also wondering if you want to run the build on JDK 17 (instead of JDK 15)
That change requires the mockito upgrade so I'm not sure if it was a good idea for me to include that.

@gtoison
Copy link
Author

gtoison commented Jan 9, 2025

I have added PR #927, it only makes small changes to branch 2.3.x

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants