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

Integrate 2023-02-15 security fix for SECURITY-3032 into default branch #491

Merged
merged 4 commits into from
Mar 6, 2023

Conversation

daniel-beck
Copy link
Member

@daniel-beck daniel-beck commented Feb 15, 2023

Security advisory

The branch histories have diverged during the staging period.

This PR should be merged using merge-commit, not using squash-commit or rebase-commit, to ensure the commits related to the release are in the history of the default branch.

Copy link
Member

@timja timja left a comment

Choose a reason for hiding this comment

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

Test fails on Windows, cc @julieheard

@daniel-beck
Copy link
Member Author

Assume.assumeFalse(Functions.isWindows()) should be a quick fix.

Longer-term, use https://javadoc.jenkins.io/component/jenkins-test-harness/org/jvnet/hudson/test/CreateFileBuilder.html instead.

@timja timja enabled auto-merge (squash) March 6, 2023 15:26
@timja timja merged commit a28c940 into master Mar 6, 2023
@timja timja deleted the v1177 branch March 6, 2023 16:01
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.

3 participants