-
-
Notifications
You must be signed in to change notification settings - Fork 8.7k
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
Upgrade Stapler from 1711.v5b_1b_03f0fcf2 to 1711.1713.vc400cfb_5597a_ #7034
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
basil
added
developer
Changes which impact plugin developers
into-lts
This PR is filed against an LTS branch
labels
Aug 25, 2022
jglick
reviewed
Aug 25, 2022
jglick
approved these changes
Aug 25, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably safe.
basil
changed the title
Upgrade Stapler from 1711.v5b_1b_03f0fcf2 to 1733.v981fdd98007e
Upgrade Stapler from 1711.v5b_1b_03f0fcf2 to 1711.1713.vc400cfb_5597a_
Aug 25, 2022
jglick
approved these changes
Aug 25, 2022
NotMyFault
approved these changes
Aug 25, 2022
oleg-nenashev
approved these changes
Aug 25, 2022
timja
approved these changes
Aug 25, 2022
krisstern
approved these changes
Aug 25, 2022
basil
added
the
squash-merge-me
Unclean or useless commit history, should be merged only with squash-merge
label
Aug 26, 2022
37 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
developer
Changes which impact plugin developers
into-lts
This PR is filed against an LTS branch
squash-merge-me
Unclean or useless commit history, should be merged only with squash-merge
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Context
Analogous to #7033.
Problem
jenkinsci/stapler#370, released in 1709.ve4c10835694b_ and adopted in
stable-2.361
in commit e2cf617, broke compatibility with PowerMock. While the majority of plugins have been migrated away from PowerMock, some remain, most notably Blue Ocean. While the long-term solution is to remove PowerMock from all plugins, we are not quite there yet, and in the meantime such plugins can't be tested against recent versions of Jenkins core.Solution
jenkinsci/stapler#402, released in 1733.v981fdd98007e and backported in 1711.1713.vc400cfb_5597a_, restores the status quo. This enables gradual PowerMock removal to continue throughout the plugin ecosystem without forcing the issue.
This PR is a backport of jenkinsci/stapler#402 to
stable-2.361
.Implementation
Upgrade Stapler from 1711.v5b_1b_03f0fcf2 to 1711.1713.vc400cfb_5597a_.
Full differential: Compare View
Testing done
Before this change,
mvn clean verify -DfailIfNoTests=false -Denforcer.skip -Dskip.npm -Dspotbugs.skip -Djenkins.version=2.361.1-rc32701.b_06d9cef554c -Dtest=io.jenkins.blueocean.blueocean_github_pipeline.GithubOrgFolderPermissionsTest
fails withAfter this change, the test passes.
Proposed changelog entries
Developer: Temporarily restore compatibility with PowerMock-based tests (regression in 2.361.1 RC 1). Support for PowerMock will be completely removed on or after June 1, 2023.
Proposed upgrade guidelines
N/A
Submitter checklist
Proposed changelog entries
section only if there are breaking changes or other changes which may require extra steps from users during the upgrade@Restricted
or have@since TODO
Javadoc, as appropriate.@Deprecated(since = "TODO")
or@Deprecated(forRemoval = true, since = "TODO")
if applicable.eval
to ease future introduction of Content-Security-Policy directives (see documentation on jenkins.io).Desired reviewers
@mention
Maintainer checklist
Before the changes are marked as
ready-for-merge
:Proposed changelog entries
are accurate, human-readable, and in the imperative moodupgrade-guide-needed
label is set and there is aProposed upgrade guidelines
section in the PR title. (example)lts-candidate
to be considered (see query).