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-72156] Backport Upgrade to Winstone 6.14 which contains an upgrade to Jetty 10.0.17 #8592

Merged
merged 3 commits into from
Oct 13, 2023

Conversation

olamy
Copy link
Member

@olamy olamy commented Oct 10, 2023

Signed-off-by: Olivier Lamy [email protected]

A backport of

Testing done

  • Started Jenkins with Winstone 6.14 from this pull request on a Linux computer running Java 17
  • Confirmed the markdown plugin worked as expected
  • Confirmed the embeddable build status plugin worked as expected
  • Confirmed that declarative Pipeline ran as expected on an inbound agent

Proposed changelog entries

  • Upgrade to Winstone 6.14 which contains an upgrade to Jetty 10.0.17

Proposed upgrade guidelines

N/A

Submitter checklist

Desired reviewers

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

Maintainer checklist

@github-actions github-actions bot added the into-lts This PR is filed against an LTS branch label Oct 10, 2023
@olamy olamy changed the title Upgrade to Winstone 6.14 which contains an upgrade to Jetty 10.0.17 Backport Upgrade to Winstone 6.14 which contains an upgrade to Jetty 10.0.17 Oct 10, 2023
Copy link
Contributor

@MarkEWaite MarkEWaite left a comment

Choose a reason for hiding this comment

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

Thanks very much! Approved

@kmartens27 this will need to be mentioned in the 2.414.3 changelog once it is merged to the stable-2.414 branch

@krisstern I think this is a good backport to have because Jetty 10.0.17 includes a fix for CVE-2023-44487

@krisstern
Copy link
Member

@MarkEWaite Sure, let me backport this as well before the actual release

@MarkEWaite
Copy link
Contributor

MarkEWaite commented Oct 11, 2023

@MarkEWaite Sure, let me backport this as well before the actual release

Thanks, but this is already a backporting pull request. No need for an additional pull request.

@MarkEWaite MarkEWaite added developer Changes which impact plugin developers rfe For changelog: Minor enhancement. use `major-rfe` for changes to be highlighted labels Oct 11, 2023
@MarkEWaite MarkEWaite changed the title Backport Upgrade to Winstone 6.14 which contains an upgrade to Jetty 10.0.17 [JENKINS-72156] Backport Upgrade to Winstone 6.14 which contains an upgrade to Jetty 10.0.17 Oct 11, 2023
pom.xml Outdated Show resolved Hide resolved
Signed-off-by: Olivier Lamy <[email protected]>
@daniel-beck daniel-beck added the squash-merge-me Unclean or useless commit history, should be merged only with squash-merge label Oct 11, 2023
@NotMyFault NotMyFault removed rfe For changelog: Minor enhancement. use `major-rfe` for changes to be highlighted squash-merge-me Unclean or useless commit history, should be merged only with squash-merge developer Changes which impact plugin developers labels Oct 12, 2023
@MarkEWaite
Copy link
Contributor

@olamy I've not been able to isolate the cause of the test failures on the stable-2.414 branch. Any insights you can offer on what might be causing the test failures? We really want / need this in the 2.414.3 LTS but I hesitate to merge with test failures.

@MarkEWaite MarkEWaite merged commit 33599b3 into jenkinsci:stable-2.414 Oct 13, 2023
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
into-lts This PR is filed against an LTS branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants