-
-
Notifications
You must be signed in to change notification settings - Fork 8.8k
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
Backporting for 2.426.1 #8658
Backporting for 2.426.1 #8658
Conversation
[JENKINS-71937] Fix deprecated Slave constructor Got broken in jenkinsci#8395 Co-authored-by: Basil Crow <[email protected]> (cherry picked from commit 6fdfdd0)
… Jetty 10.0.17 (jenkinsci#8587) Upgrade to Winstone 6.14 which contains an upgrade to Jetty 10.0.17 Signed-off-by: Olivier Lamy <[email protected]> (cherry picked from commit 8792ea0)
…sci#8422) * [JENKINS-71252] Show form validation for hidden elements * [JENKINS-70793] Clear all validation output on update --------- Co-authored-by: Daniel Beck <[email protected]> (cherry picked from commit 012fa00)
… and buttons (jenkinsci#8602) * [JENKINS-72170] fix for nested-hetero-list entries when a plugin defines the hetero-list elements on its own and still uses an <input type="button"> element and an inner element is already using a hetero-list with a <button> element, then the old input wasn't converted to a button as the inner button was found first. Avoid this by converting all inputs to buttons before actually looking up the button. Recreate the hetero-list.js file to avoid the "No such adjunct found" warning message * remove hetero-list.js again (cherry picked from commit 97dde8f)
…76b_9ddd10cc (jenkinsci#8600) Bump org.jenkins-ci.main:remoting Bumps [org.jenkins-ci.main:remoting](https://github.com/jenkinsci/remoting) from 3148.v532a_7e715ee3 to 3160.vd76b_9ddd10cc. - [Release notes](https://github.com/jenkinsci/remoting/releases) - [Changelog](https://github.com/jenkinsci/remoting/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/remoting/commits) --- updated-dependencies: - dependency-name: org.jenkins-ci.main:remoting dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit aea86c4)
* [JENKINS-72020] Reorder clouds Adding back controls to reorder clouds. Since clouds order is taken into account for node provisioning, users should be able to reorder them as needed. * Use tertiary buttons * Separate screen for reordering * Include reordering in the cloud list directly (thanks @timja) * Show the save button after the first reordering * Separate JS Only display order column when admin * Fix reviews * Remove unused string * Put drag-and-drop handle in the cloud icon column * Add missing permission check * Add a small blurb to clarify what cloud order is used for. (cherry picked from commit 16bca2e)
Based on the answer from @timja I've added e6b453b , a backport of the fix for JENKINS-72020 - Restore ability to reorder clouds |
Co-authored-by: Daniel Beck <[email protected]> (cherry picked from commit 3218599)
…enkinsci#8606) Co-authored-by: Daniel Beck <[email protected]> (cherry picked from commit d6b4637)
@daniel-beck replied and marked two issues as LTS candidates so they are included as 5080643 and b560797 Those are backports of: |
@@ -86,7 +86,7 @@ THE SOFTWARE. | |||
<changelog.url>https://www.jenkins.io/changelog</changelog.url> | |||
|
|||
<!-- Bundled Remoting version --> | |||
<remoting.version>3148.v532a_7e715ee3</remoting.version> | |||
<remoting.version>3160.vd76b_9ddd10cc</remoting.version> |
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.
FTR jenkinsci/remoting@3148.v532a_7e715ee3...3160.vd76b_9ddd10cc = jenkinsci/remoting#675 plus some unrelated changes; see discussion in https://issues.jenkins.io/browse/JENKINS-72163
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.
Thanks for pointing to that difference! I had missed that there is an additional bug fix that is included in remoting 3160 as delivered in Jenkins 2.428. The additional fix is JENKINS-65368 Remoting agent.jar does not work behind proxy. I've labeled that bug report as 2.426.1-fixed
in Jira and included it in the pull request description
Backporting for LTS 2.426.1
Latest core version: Jenkins 2.429
Fixed
The developer mailing list has the backporting announcement. The 2.426.1 release checklist has more information as well.
Several candidates are not included in this pull request, but the authors of those candidates have been asked if those changes should be included in the 2.426.1 LTS backports. Those include:
Testing done
Ran the generated war file interactively with Java 11, Java 17, and Java 21 and confirmed that it was well behaved with a few minutes of interactive testing.
Ran tests successfully with
mvn clean verify
on Linux.Proposed changelog entries
N/A - changelog will be created by the documentation team.
Proposed upgrade guidelines
N/A - no items in this pull request that need an entry in the upgrade guide
Submitter checklist
@Restricted
or have@since TODO
Javadocs, as appropriate.@Deprecated(since = "TODO")
or@Deprecated(forRemoval = true, since = "TODO")
, if applicable.eval
to ease future introduction of Content Security Policy (CSP) directives (see documentation).Desired reviewers
@NotMyFault
Before the changes are marked as
ready-for-merge
:Maintainer checklist
upgrade-guide-needed
label is set and there is a Proposed upgrade guidelines section in the pull request title (see example).lts-candidate
to be considered (see query).