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

First backporting for LTS 2.361.1 #6993

Merged

Conversation

krisstern
Copy link
Member

@krisstern krisstern commented Aug 14, 2022

Summary

This is the first backporting PR for LTS 2.361.1

Latest core version: jenkins-2.363

Fixed
-----

JENKINS-69240           Minor                   2.363
        Version select input is out of style with other drop down select input
        https://issues.jenkins.io/browse/JENKINS-69240

JENKINS-69230           Minor                   2.363
        There is no space between the form and the button
        https://issues.jenkins.io/browse/JENKINS-69230

JENKINS-69211           Minor                   2.363
        There is no space between the line and the button
        https://issues.jenkins.io/browse/JENKINS-69211

JENKINS-69210           Blocker                 2.363
        Unable to rebuild a job triggered by polling (regression in 2.358)
        regression
        https://issues.jenkins.io/browse/JENKINS-69210

JENKINS-69198           Major                   2.362
        Jenkins 2.361 core sources & javadoc not on repo.jenkins-ci.org
        regression
        https://issues.jenkins.io/browse/JENKINS-69198

JENKINS-68957           Minor                   2.363
        Job configuration page SCM radio buttons have an odd selection animation
        https://issues.jenkins.io/browse/JENKINS-68957

JENKINS-68851           Minor                   2.362
        Press enter in the filter box of dropdown lists leads to other pages
        https://issues.jenkins.io/browse/JENKINS-68851

JENKINS-68801           Minor                   2.362
        Symbol framework doesn't work properly if plugin's artifactId contains word "plugin-"
        https://issues.jenkins.io/browse/JENKINS-68801

JENKINS-68750           Minor                   2.362
        Plugin Manager does not sort by timestamp (regression in 2.274)
        regression
        https://issues.jenkins.io/browse/JENKINS-68750

JENKINS-68694           Major                   2.363
        Winstone 6.1: Upgrade Jetty from 9.4.46.v20220331 to 10.0.11
        https://issues.jenkins.io/browse/JENKINS-68694

JENKINS-68578           Minor                   2.362
        Test overview bar is out of style with other Jenkins components
        https://issues.jenkins.io/browse/JENKINS-68578

JENKINS-68390           Minor                   2.361
        Build number cut off on safari (regression in 2.344)
        regression
        https://issues.jenkins.io/browse/JENKINS-68390

JENKINS-68380           Minor                   2.357
        Script console input box is not sizeable, yet the box looks like it is (regression in 2.321)
        regression
        https://issues.jenkins.io/browse/JENKINS-68380

JENKINS-65873           Major                   2.362
        java.lang.OutOfMemoryError: unable to create new native thread
        https://issues.jenkins.io/browse/JENKINS-65873

Submitter checklist

  • (If applicable) Jira issue is well described. (N/A)
  • Changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developer, depending on the change) and are in the imperative mood. Examples (N/A)
    • 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.
  • New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadoc, as appropriate. (N/A)
  • New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO") if applicable. (N/A)
  • New or substantially changed JavaScript is not defined inline and does not call eval to ease future introduction of Content-Security-Policy directives (see documentation on jenkins.io). (N/A)
  • For dependency updates: links to external changelogs and, if possible, full diffs. (N/A)

Desired reviewers

@basil @alecharp @timja @NotMyFault

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

basil and others added 14 commits August 14, 2022 18:39
…nkinsci#6936)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 289855b)
…10.0.11 (jenkinsci#6801)

Co-authored-by: Jesse Glick <jglick@cloudbees.com>
(cherry picked from commit cb1bbc7)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 1466525)
…nkinsci#6692)

Co-authored-by: Alexander Brandes <mc.cache@web.de>
(cherry picked from commit c0be0fd)
…down select input (jenkinsci#6963)

Co-authored-by: Alexander Brandes <mc.cache@web.de>
(cherry picked from commit 2072281)
…nkinsci#6957)

Co-authored-by: Alexander Brandes <mc.cache@web.de>
(cherry picked from commit 26651de)
…nkinsci#6961)

Co-authored-by: Alexander Brandes <mc.cache@web.de>
(cherry picked from commit a523704)
…kinsci#6902)

Co-authored-by: Temirlan Dyussyumbayev <bzzitsme@users.noreply.github.com>
Co-authored-by: Alexander Brandes <mc.cache@web.de>
(cherry picked from commit 83bf697)
…selection animation (jenkinsci#6930)

Co-authored-by: Alexander Brandes <mc.cache@web.de>
(cherry picked from commit eb59bc1)
@NotMyFault NotMyFault added the into-lts This PR is filed against an LTS branch label Aug 14, 2022
@NotMyFault NotMyFault changed the base branch from master to stable-2.361 August 14, 2022 13:36
@krisstern krisstern mentioned this pull request Aug 14, 2022
37 tasks
@NotMyFault
Copy link
Member

NotMyFault commented Aug 14, 2022

You can skip 0fb45e6 and 3bd8075 from backporting, because the baseline already contains these changes, see the empty commits.

Non blocking feedback from my side, but I'd suggest to remove the couple of commist from the PR summary and adjust the Jira issues, if you choose to rewrite the history.

@basil
Copy link
Member

basil commented Aug 14, 2022

Nice job, Kris! This branch is still susceptible to the AbstractMethodError described in jenkins-infra/helpdesk#3049 (comment), and since core-taglibs-report-generator uses the latest LTS release I think the next LTS release should support tag library documentation generation. So we should pull in jenkinsci/pom#298 via https://github.com/jenkinsci/pom/releases/tag/jenkins-1.85 (i.e., a backport of commit 799fea8). I verified that with

diff --git a/pom.xml b/pom.xml
index 044cd96ade..a0ebe98f41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.84</version>
+    <version>1.85</version>
     <relativePath />
   </parent>

on your branch, running mvn --show-version --batch-mode -DgenerateProjectInfo=false -DgenerateSitemap=false -e clean site:site in jenkinsci/core no longer resulted in an AbstractMethodError and successfully generated the tag library documentation.

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 799fea8)
@krisstern
Copy link
Member Author

@NotMyFault I think I will leave the history and Jira issues as is this time. But if I get to do the backporting again I will keep it in mind.

@timja I have just backported 799fea8.

@timja timja merged commit b06d9ce into jenkinsci:stable-2.361 Aug 20, 2022
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