Skip to content

Revert winstone update#11197

Merged
timja merged 1 commit intojenkinsci:masterfrom
timja:revert-winstone-upgrade
Oct 12, 2025
Merged

Revert winstone update#11197
timja merged 1 commit intojenkinsci:masterfrom
timja:revert-winstone-upgrade

Conversation

@timja
Copy link
Member

@timja timja commented Oct 11, 2025

See jetty/jetty.project#13626 and jetty/jetty.project#13698

The jetty update broke the jetty maven plugin.
It can be worked around locally by e.g. changing the , to a : in extraClassPath but on Windows it needs to be ;.

Don't think there's any great fix short of fixing this in Jetty.

Testing done

Proposed changelog entries

  • human-readable text

Proposed changelog category

/label

Proposed upgrade guidelines

N/A

Submitter checklist

  • The Jira issue, if it exists, is well-described.
  • The changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developers, depending on the change) and are in the imperative mood (see examples). Fill in the Proposed upgrade guidelines section only if there are breaking changes or changes that may require extra steps from users during upgrade.
  • There is automated testing or an explanation as to why this change has no tests.
  • New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadocs, as appropriate.
  • New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO"), if applicable.
  • New or substantially changed JavaScript is not defined inline and does not call eval to ease future introduction of Content Security Policy (CSP) directives (see documentation).
  • For dependency updates, there are links to external changelogs and, if possible, full differentials.
  • For new APIs and extension points, there is a link to at least one consumer.

Desired reviewers

@mention

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

Maintainer checklist

  • There are at least two (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 is not blocking the change.
  • Changelog entries in the pull request title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood.
  • Proper changelog labels are set so that the changelog can be generated automatically.
  • If the change needs additional upgrade steps from users, the upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the pull request title (see 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).

@timja timja added the skip-changelog Should not be shown in the changelog label Oct 11, 2025
@timja timja requested a review from a team October 11, 2025 22:11
@timja
Copy link
Member Author

timja commented Oct 11, 2025

FYI @olamy

@timja timja mentioned this pull request Oct 11, 2025
14 tasks
@timja
Copy link
Member Author

timja commented Oct 12, 2025

There's a PR for 12.1.3 - jetty/jetty.project#13665, lets just wait for that version for Java 25, merging this now to not block people developing core.

@timja timja merged commit f32456d into jenkinsci:master Oct 12, 2025
16 of 17 checks passed
@timja timja deleted the revert-winstone-upgrade branch October 12, 2025 07:21
@olamy
Copy link
Member

olamy commented Oct 12, 2025

FYI @olamy

Urgent release scheduled for the coming days, so the fix will be part of the next monthly release (end of October)

@alecharp alecharp mentioned this pull request Oct 13, 2025
1 task
@olamy
Copy link
Member

olamy commented Oct 15, 2025

@timja FYI. Finally 12.1.3 will include the fix and be released by the end of the week (or early next week)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip-changelog Should not be shown in the changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants