Backporting for Jenkins 2.492.3 release candidate by gounthar · Pull Request #10412 · jenkinsci/jenkins

gounthar · 2025-03-18T16:20:17Z

Thanks a lot to @krisstern and @MarkEWaite for their guidance and patience.

See:

Fixed
-----

JENKINS-75224           Minor                   2025-02-03 21:19
        Remove support for ?jsonp parameter from Flavor.JSON in Stapler
        improvement
        https://issues.jenkins.io/browse/JENKINS-75224

JENKINS-75278           Minor                   2025-02-13 11:10
        User pages for users with '\' in the user name fail after upgrading to 2.479.1
        bug
        https://issues.jenkins.io/browse/JENKINS-75278           

JENKINS-75321           Minor                   2025-02-21 13:28
        "No builds" displayed for a brief time when loading build history
        bug
        https://issues.jenkins.io/browse/JENKINS-75321

Testing done

mvn clean install

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).

(cherry picked from commit 84ac21f)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit 986f631)

(cherry picked from commit bcda96c)

Update stapler.version to v1948 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit 14288b1)

…t of build history widget (cherry picked from commit 5d65d11)

…fter upgrading to 2.479.1 (jenkinsci#10344) Signed-off-by: Olivier Lamy <olamy@apache.org> (cherry picked from commit 9f91315)

…erBoundDeps failed

(cherry picked from commit 84ac21f)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit 986f631)

(cherry picked from commit 53ad7f9)

(cherry picked from commit bcda96c)

…0217) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit 6558a65)

Update stapler.version to v1948 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit 14288b1)

…t of build history widget (cherry picked from commit 5d65d11)

…fter upgrading to 2.479.1 (jenkinsci#10344) Signed-off-by: Olivier Lamy <olamy@apache.org> (cherry picked from commit 9f91315)

…ctionConverter

@deprecated

@deprecated]'.

…line.

@deprecated

@deprecated]'.

…line.

…us line.

…-codec:1.17.2

…s may only be represented as {} when not part of a multi-block statement (4.1.3)

…us line.

…-1-a

Backport changes from MarkEWaite

gounthar · 2025-03-18T17:29:29Z

        <groupId>org.eclipse.jetty.ee9</groupId>
        <artifactId>jetty-ee9-maven-plugin</artifactId>
-        <version>12.0.16</version>
+        <version>12.0.17</version>


Should we stay with 12.0.16 or go to 12.0.18?
c.f. https://groups.google.com/g/jenkinsci-dev/c/vm4XhQ7FhqY/m/ijXXUTdYBAAJ?utm_medium=email&utm_source=footer

gounthar · 2025-03-18T19:57:45Z

It looks like one test (hudson.cli.EnablePluginCommandTest.enableNoPluginsWithRestartIsNoOp) failed.

I sincerely apologize if this issue causes us to miss the release candidate deadline.

daniel-beck · 2025-03-18T21:18:48Z

Why are there 40 commits in this PR?

gounthar · 2025-03-18T21:50:11Z

I haven't squashed the commits yet because I was attempting to "document" my journey while getting everything to compile.
If the result looks more like a spaghetti bowl than a Hanoi tower, we still have alternatives. Mark has a branch that builds with only a few commits, and Kris also has a successful branch.

MarkEWaite · 2025-03-18T21:59:20Z

Why are there 40 commits in this PR?

Many of the small commits are spotbugs fixes. However, as far as I can tell, they aren't required.

Here are the commits that need to be cherry picked for the desired 3 backports:

JENKINS-75224 - Remove support for ?jsonp parameter from Flavor.JSON in Stapler

87047bc Consistent Jelly version for commons-jelly-tags-fmt
- Consistent Jelly version for commons-jelly-tags-fmt #10128
627cb6d Update jelly.version to v1.1-jenkins-20250108
- Update jelly.version to v1.1-jenkins-20250108 #10132
8564e2c Consistent Jelly version for commons-jelly-tags-xml
- Consistent Jelly version for commons-jelly-tags-xml #10131
b27a75b Remove Commons Discovery
- Remove Commons Discovery #10122
0895467 Update dependency commons-codec:commons-codec to v1.18.0
- Update dependency commons-codec:commons-codec to v1.18.0 #10217
79e0f36 Update stapler.version to v1948 (major)
- Update stapler.version to v1948 (major) #10257

Unfortunately, the sequence of cherry pick commits that @gounthar used is missing

8564e2c Consistent Jelly version for commons-jelly-tags-xml
- Consistent Jelly version for commons-jelly-tags-xml #10131

JENKINS-75321 - "No builds" displayed for a brief time when loading build history

f50fe77 [JENKINS-75321] Clarify the message displayed when loading the content of build history widget
- [JENKINS-75321] Clarify the message displayed when loading the content of the build history widget #10309

JENKINS-75278 - User pages for users with '\' in the user name fail after upgrading to 2.479.1

5c91e78 [JENKINS-75278] User pages for users with '' in the user name fail after upgrading to 2.479.1
- [JENKINS-75278] User pages for users with '\' in the user name fail after upgrading to 2.479.1 #10344

As far as I can tell, if we want JENKINS-75278, then we need to include JENKINS-75224 and its 6 cherry picked commits as predecessors to JENKINS-75278. If we were to decide that we do not want JENKINS-75224, then the cherry-picked commits for JENKINS-75224 will still be needed as part of JENKINS-75278. Updating the Jetty version needs those extra commits to be cherry-picked.

basil · 2025-03-18T23:44:25Z

Can someone explain to me the reason why we want JENKINS-75224 backported? Is it wanted in itself for some particular reason, or only as an apparent prerequisite for JENKINS-75278? While I included jenkinsci/stapler#649 in JENKINS-75278 for completeness, strictly speaking the Stapler portion of those changes is only test code and not necessary to backport JENKINS-75278 to production. Unless there is a particular reason to backport JENKINS-75224 in and of itself, I see no reason to make any Stapler changes as part of the backport of JENKINS-75278.

MarkEWaite · 2025-03-19T00:08:08Z

Can someone explain to me the reason why we want JENKINS-75224 backported?

@gounthar and I included it because it was labeled as an lts-candidate. However, considering the number of other changes that need to be cherry picked in order to include it, I think it may be best to not include it.

I have investigated further and what I said earlier was wrong. I said:

As far as I can tell, if we want JENKINS-75278, then we need to include JENKINS-75224 and its 6 cherry picked commits as predecessors to JENKINS-75278. If we were to decide that we do not want JENKINS-75224, then the cherry-picked commits for JENKINS-75224 will still be needed as part of JENKINS-75278. Updating the Jetty version needs those extra commits to be cherry-picked.

If we don't include JENKINS-75224 in the backport, then the cherry picked commits are much simpler:

5d65d11 [JENKINS-75321] Clarify the message displayed when loading the content of build history widget
- [JENKINS-75321] Clarify the message displayed when loading the content of the build history widget #10309
9f91315 [JENKINS-75278] User pages for users with '\' in the user name fail after upgrading to 2.479.1
- [JENKINS-75278] User pages for users with '\' in the user name fail after upgrading to 2.479.1 #10344

Those commits apply cleanly to stable-2.492 with only 1 conflict that is easily resolved. The result is in https://github.com/MarkEWaite/jenkins/tree/stable-2.492.3-backport-1-c

daniel-beck · 2025-03-19T00:12:23Z

Remove support for ?jsonp parameter from Flavor.JSON in Stapler

As author and backport requester, this change is definitely not worth this mess. It would have been nice to have and that's it.

MarkEWaite · 2025-03-19T00:24:49Z

I've proposed an alternative backports pull request:

Backporting for Jenkins 2.492.3 release candidate #10417

Automated tests are still running on my local computer. I'll also do some interactive testing while ci.jenkins.io is evaluating the pull request.

gounthar · 2025-03-19T08:30:20Z

Thank you so much, Mark, and I apologize to everyone for the mess with the pull request. It's full of spaghetti cherry picks!

MarkEWaite · 2025-03-19T11:08:17Z

Thanks @gounthar . I think we should close this pull request and instead we should use:

Backporting for Jenkins 2.492.3 release candidate #10417

Thanks very much for being the 2.492.3 release lead.

basil and others added 30 commits March 17, 2025 19:18

Consistent Jelly version for commons-jelly-tags-fmt (jenkinsci#10128)

9706e31

(cherry picked from commit 84ac21f)

Update jelly.version to v1.1-jenkins-20250108 (jenkinsci#10132)

ab8ce96

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit 986f631)

Remove Commons Discovery (jenkinsci#10122)

46590c3

(cherry picked from commit bcda96c)

Update stapler.version to v1948 (major) (jenkinsci#10257)

9c7db35

Update stapler.version to v1948 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit 14288b1)

[JENKINS-75321] Clarify the message displayed when loading the conten…

b485160

…t of build history widget (cherry picked from commit 5d65d11)

[JENKINS-75278] User pages for users with '\' in the user name fail a…

44fb567

…fter upgrading to 2.479.1 (jenkinsci#10344) Signed-off-by: Olivier Lamy <olamy@apache.org> (cherry picked from commit 9f91315)

fix: 'METHOD_DEF' should be separated from previous line.

fc63cca

fix: 'VARIABLE_DEF' should be separated from previous line.

35ef0c2

chore: add commons-codec dependency version 1.18.0 because RequireUpp…

83cc621

…erBoundDeps failed

fix: LineLength: Line is longer than 240 characters (found 270).

db6192d

Consistent Jelly version for commons-jelly-tags-fmt (jenkinsci#10128)

87047bc

(cherry picked from commit 84ac21f)

Update jelly.version to v1.1-jenkins-20250108 (jenkinsci#10132)

627cb6d

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit 986f631)

Consistent Jelly version for commons-jelly-tags-xml (jenkinsci#10131)

8564e2c

(cherry picked from commit 53ad7f9)

Remove Commons Discovery (jenkinsci#10122)

b27a75b

(cherry picked from commit bcda96c)

Update dependency commons-codec:commons-codec to v1.18.0 (jenkinsci#1…

0895467

…0217) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit 6558a65)

Update stapler.version to v1948 (major) (jenkinsci#10257)

79e0f36

Update stapler.version to v1948 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit 14288b1)

[JENKINS-75321] Clarify the message displayed when loading the conten…

f50fe77

…t of build history widget (cherry picked from commit 5d65d11)

[JENKINS-75278] User pages for users with '\' in the user name fail a…

5c91e78

…fter upgrading to 2.479.1 (jenkinsci#10344) Signed-off-by: Olivier Lamy <olamy@apache.org> (cherry picked from commit 9f91315)

fix: reformat method parameters for better readability in RobustRefle…

7c00abf

…ctionConverter

fix: WhitespaceAround: '=' is not followed by whitespace

0939d81

fix: Line is longer than 240 characters (found 244).

c7585c6

fix: Block tags have to appear in the order '[@param, @return, @throws,

d79c9cc

@deprecated]'.

fix: 'INTERFACE_DEF' should be separated from previous line.

601702b

fix: EmptyLineSeparator: 'package' should be separated from previous …

32d5036

…line.

fix: EmptyLineSeparator: 'package' should be separated from previous …

87608f3

…line.

fix: EmptyLineSeparator: 'package' should be separated from previous …

4e40d1e

…line.

fix: Block tags have to appear in the order '[@param, @return, @throws,

427207f

@deprecated]'.

fix: EmptyLineSeparator: 'package' should be separated from previous …

21e7afb

…line.

fix: EmptyLineSeparator: 'METHOD_DEF' should be separated from previo…

c102ee9

…us line.

fix: EmptyLineSeparator: 'METHOD_DEF' should be separated from previo…

544076e

…us line.

gounthar added 11 commits March 18, 2025 10:59

fix: WhitespaceAfter: ',' is not followed by whitespace.

3412679

fix: Unused @param tag for 'simplifyExpectedValue'.

e8a64e3

fix: Require upper bound dependencies error for commons-codec:commons…

7e02907

…-codec:1.17.2

fix: OneStatementPerLine: Only one statement per line allowed.

aeb9343

fix: WhitespaceAfter: ',' is not followed by whitespace.

c3f78ec

fix: WhitespaceAround: '+' is not followed by whitespace. Empty block…

6e35c79

…s may only be represented as {} when not part of a multi-block statement (4.1.3)

fix: LineLength: Line is longer than 240 characters.

a6288f6

fix: EmptyLineSeparator: 'METHOD_DEF' should be separated from previo…

ca46e06

…us line.

fix: RedundantModifier: Redundant 'public' modifier.

f17fe93

Merge branch 'stable-2.492.3-backport-1' into stable-2.492.3-backport…

8a76ca1

…-1-a

Merge pull request #3 from gounthar/stable-2.492.3-backport-1-a

4c3abed

Backport changes from MarkEWaite

github-actions Bot added the into-lts This PR is filed against an LTS branch label Mar 18, 2025

gounthar changed the title ~~Stable 2.492.3 backport 1~~ Backporting for Jenkins 2.492.3 release candidate Mar 18, 2025

gounthar marked this pull request as ready for review March 18, 2025 17:01

gounthar commented Mar 18, 2025

View reviewed changes

krisstern requested review from basil and timja March 18, 2025 18:05

gounthar closed this Mar 19, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Backporting for Jenkins 2.492.3 release candidate#10412

Backporting for Jenkins 2.492.3 release candidate#10412
gounthar wants to merge 41 commits into
jenkinsci:stable-2.492from
gounthar:stable-2.492.3-backport-1

gounthar commented Mar 18, 2025 •

edited

Loading

Uh oh!

gounthar Mar 18, 2025

Uh oh!

gounthar commented Mar 18, 2025 •

edited

Loading

Uh oh!

daniel-beck commented Mar 18, 2025

Uh oh!

gounthar commented Mar 18, 2025

Uh oh!

MarkEWaite commented Mar 18, 2025 •

edited

Loading

Uh oh!

basil commented Mar 18, 2025

Uh oh!

MarkEWaite commented Mar 19, 2025

Uh oh!

daniel-beck commented Mar 19, 2025 •

edited

Loading

Uh oh!

MarkEWaite commented Mar 19, 2025

Uh oh!

gounthar commented Mar 19, 2025

Uh oh!

MarkEWaite commented Mar 19, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Conversation

gounthar commented Mar 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Testing done

Maintainer checklist

Uh oh!

gounthar Mar 18, 2025

Choose a reason for hiding this comment

Uh oh!

gounthar commented Mar 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

daniel-beck commented Mar 18, 2025

Uh oh!

gounthar commented Mar 18, 2025

Uh oh!

MarkEWaite commented Mar 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

JENKINS-75224 - Remove support for ?jsonp parameter from Flavor.JSON in Stapler

JENKINS-75321 - "No builds" displayed for a brief time when loading build history

JENKINS-75278 - User pages for users with '\' in the user name fail after upgrading to 2.479.1

Uh oh!

basil commented Mar 18, 2025

Uh oh!

MarkEWaite commented Mar 19, 2025

Uh oh!

daniel-beck commented Mar 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MarkEWaite commented Mar 19, 2025

Uh oh!

gounthar commented Mar 19, 2025

Uh oh!

MarkEWaite commented Mar 19, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

gounthar commented Mar 18, 2025 •

edited

Loading

gounthar commented Mar 18, 2025 •

edited

Loading

MarkEWaite commented Mar 18, 2025 •

edited

Loading

daniel-beck commented Mar 19, 2025 •

edited

Loading