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

Consolidate version-3 and Java-11 branches #594

Merged
merged 10 commits into from
Sep 6, 2024
Merged

Consolidate version-3 and Java-11 branches #594

merged 10 commits into from
Sep 6, 2024

Conversation

rjust
Copy link
Owner

@rjust rjust commented Sep 3, 2024

No description provided.

@rjust rjust requested review from markro49 and mernst September 3, 2024 23:51
@rjust
Copy link
Owner Author

rjust commented Sep 3, 2024

@markro49 Are the JacksonDatabind diffs OK to include, or are these no longer necessary for Java-11 compatibility?

mernst
mernst approved these changes Sep 4, 2024
View reviewed changes
Copy link
Collaborator

@mernst mernst left a comment

Choose a reason for hiding this comment

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

This looks good, thanks.
I only pointed out a few style issues.

framework/lib/test_generation/bin/_tool.source Outdated Show resolved Hide resolved
framework/lib/test_generation/bin/_tool.source Outdated Show resolved Hide resolved
framework/projects/Mockito/chooseDepedencyVersion.sh Outdated Show resolved Hide resolved
framework/test/test_export_command.sh Outdated Show resolved Hide resolved
@rjust rjust merged commit 951c360 into java-11-compatibility Sep 6, 2024
0 of 2 checks passed
@rjust rjust deleted the version-3 branch September 6, 2024 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mernst mernst mernst approved these changes

@markro49 markro49 Awaiting requested review from markro49

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rjust @mernst