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

[JENKINS-64035] - Winstone 5.12: Update Jetty from 9.4.30.v20200611 to 9.4.33.v20201020 #5034

Merged
merged 1 commit into from
Oct 26, 2020

Conversation

oleg-nenashev
Copy link
Member

@oleg-nenashev oleg-nenashev commented Oct 26, 2020

The 9.4.33.v20201020 Jetty version picks up an upstream fix for jetty/jetty.project#5417 which caused JENKINS-63958 in Jenkins 2.261 and was worked around by downgrading Jetty in Winstone 5.11.1 and Jenkins 2.263. It would be great to include the new version into the weekly release, and then, maybe, consider it for backporting to 2.263.x LTS if the community ratings are fine.

Proposed changelog entries

Proposed upgrade guidelines

N/A

Submitter checklist

  • (If applicable) Jira issue is well described
  • Changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developer, depending on the change). Examples
    • Fill-in the Proposed changelog entries section only if there are breaking changes or other changes which may require extra steps from users during the upgrade
  • Appropriate autotests or explanation to why this change has no tests
  • For dependency updates: links to external changelogs and, if possible, full diffs

Desired reviewers

@mention

Maintainer checklist

Before the changes are marked as ready-for-merge:

  • There are at least 2 approvals for the pull request and no outstanding requests for change
  • Conversations in the pull request are over OR it is explicit that a reviewer does not block the change
  • Changelog entries in the PR title and/or Proposed changelog entries are correct
  • Proper changelog labels are set so that the changelog can be generated automatically
  • If the change needs additional upgrade steps from users, upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the PR title. (example)
  • If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).

@oleg-nenashev oleg-nenashev added the rfe For changelog: Minor enhancement. use `major-rfe` for changes to be highlighted label Oct 26, 2020
Copy link
Contributor

@Wadeck Wadeck left a comment

Choose a reason for hiding this comment

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

👍

@oleg-nenashev
Copy link
Member Author

@jenkinsci/core I suggest an expedited merge of this pull request into 2.264. It would help us to collect more community feedback and decide whether the new Jetty release can be [threoretically] backported into 2.263.1

@oleg-nenashev oleg-nenashev added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Oct 26, 2020
@oleg-nenashev
Copy link
Member Author

We may merge it tomorrow at 9AM UTC if there is no negative feedback. Please see the merge process documentation for more information about the merge process

@timja
Copy link
Member

timja commented Oct 26, 2020

We may merge it tomorrow at 9AM UTC if there is no negative feedback. Please see the merge process documentation for more information about the merge process

I suggest just merging after CI is green...

Copy link
Member

@jglick jglick left a comment

Choose a reason for hiding this comment

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

:shipit:

@oleg-nenashev
Copy link
Member Author

OK, taking the feedback. 🚢 🇮🇹

@oleg-nenashev oleg-nenashev merged commit 4f17ac6 into master Oct 26, 2020
@oleg-nenashev oleg-nenashev deleted the winstone/5.12 branch October 26, 2020 12:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback rfe For changelog: Minor enhancement. use `major-rfe` for changes to be highlighted
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants