Skip to content
This repository has been archived by the owner on Nov 19, 2024. It is now read-only.

[SECURITY-3061] #217

Merged
merged 1 commit into from
Mar 24, 2023
Merged

[SECURITY-3061] #217

merged 1 commit into from
Mar 24, 2023

Conversation

daniel-beck
Copy link
Member

Integrate fix for SECURITY-3061 into master branch.

Since the private repo had this commit on its master branch, I assume the idea is for this to be merged into public master. 6cd38c0 caused the branches to diverge.

Alternatively there's also https://github.com/jenkinsci/jacoco-plugin/tree/3.3.2.x, from which 3.3.2.1 was released, which you can integrate at https://github.com/jenkinsci/jacoco-plugin/compare/3.3.2.x?expand=1. In that case I recommend merging using merge-commit, to retain the release commits on the history of the default branch.

IMPORTANT: I've made the master branch read-only to prevent accidental releases from merging other PRs that do not contain this security fix. Delete the branch protection rule to revert this.

@daniel-beck daniel-beck requested a review from centic9 March 22, 2023 23:11
Copy link
Member

@centic9 centic9 left a comment

Choose a reason for hiding this comment

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

lgtm

@centic9 centic9 merged commit 47e943c into master Mar 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants