Skip to content

[JENKINS-65237] Bump Groovy from 2.4.12 to 2.4.21 #373

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

Merged
merged 8 commits into from
Feb 23, 2022

Conversation

basil
Copy link
Member

@basil basil commented Dec 15, 2021

Adapting to jenkinsci/jenkins#5939, specifically this comment:

GROOVY-8428 appears to be the only new APIs that could be relevant to Jenkins users. I think it would make sense to add them to generic-whitelist in script-security when groovy-sandbox is updated assuming the Jenkins baseline in the plugin is updated as well.

The change to GroovyCallSiteSelectorTest adapts a test that was using a Guava class that was removed in the latest version of Guava, which is now present in core. I resolved this issue by replacing the usage with the equivalent class from Apache Commons IO.

@basil basil marked this pull request as ready for review January 6, 2022 22:53
@jglick jglick added the dependencies Pull requests that update a dependency file label Jan 7, 2022
@jglick
Copy link
Member

jglick commented Jan 7, 2022

Should probably first wait for #368 to be released, then merge #382, then this.

@basil
Copy link
Member Author

basil commented Jan 7, 2022

Yeah, I'm not in any rush for this to be merged. I just wanted to file the PR to close the loop on remaining tasks regarding the Groovy upgrade.

@NotMyFault
Copy link
Member

Heyo @basil,

do you look forward to merge this PR anytime soon? See my PR linked, it would depend on the baseline bump you look forward to do.

@jglick jglick requested a review from car-roll February 16, 2022 13:20
@basil
Copy link
Member Author

basil commented Feb 16, 2022

do you look forward to merge this PR anytime soon?

I am not a maintainer, but perhaps @car-roll could consider merging this now that we have an additional use case in mind.

Copy link
Contributor

@car-roll car-roll left a comment

Choose a reason for hiding this comment

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

Will merge once @timja 's comment is addressed

Co-authored-by: Jesse Glick <[email protected]>
@basil
Copy link
Member Author

basil commented Feb 18, 2022

BTW my general preference is for all of my PRs to be squash-merged to keep the history clean, but I recognize that others have different preferences. I do not feel strongly about this, and ultimately the decision is up to the maintainer.

@car-roll car-roll merged commit 09aa6c9 into jenkinsci:master Feb 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants