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

Upgrade from Guice 5.1.0 to 6.0.0 #7990

Merged
merged 2 commits into from May 16, 2023
Merged

Conversation

NotMyFault
Copy link
Member

@NotMyFault NotMyFault commented May 13, 2023

Guice 6 smooths the way for Jakarta bindings, by keeping compatibility with javax.* and adding support for jakarta.* alongside, where Guice 7 ended support for javax.* bindings while supporting jakarta.* only.
Going from 5 to 6, over 5 to 7, is the safer approach because we can adapt jakarta when we're ready for it, without immediately cutting support for javax.

Additionally, it supports Java 21, which I'm really looking forward to :)

Closes #7987

Testing done

Compiling Jenkins against guice 6, while inspecting our methods bound properly.
Built a couple of pipeline and freestyle jobs and clicked around UI elements.
CI tests are passing too.

Proposed changelog entries

  • Upgrade from Guice 5 to 6.

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

Maintainer checklist

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

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

@NotMyFault NotMyFault added dependencies Pull requests that update a dependency file java Pull requests that update Java code labels May 13, 2023
@NotMyFault NotMyFault marked this pull request as ready for review May 13, 2023 15:56
@NotMyFault NotMyFault added the skip-changelog Should not be shown in the changelog label May 13, 2023
Copy link
Member

@timja timja left a comment

Choose a reason for hiding this comment

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

Might be worth a changelog entry?

@NotMyFault
Copy link
Member Author

Might be worth a changelog entry?

There we go.

@timja timja added rfe For changelog: Minor enhancement. use `major-rfe` for changes to be highlighted and removed skip-changelog Should not be shown in the changelog labels May 14, 2023
@MarkEWaite
Copy link
Contributor

MarkEWaite commented May 14, 2023

I've submitted a draft plugin bill of materials pull request to test this change.

Should it also be run in the acceptance tests?

@NotMyFault
Copy link
Member Author

Should it also be run in the acceptance tests?

ATH is green.

MarkEWaite added a commit to MarkEWaite/acceptance-test-harness that referenced this pull request May 15, 2023
@MarkEWaite
Copy link
Contributor

MarkEWaite commented May 15, 2023

ATH is green.

I think that we should check it with a full run of the acceptance test harness. I've submitted jenkinsci/acceptance-test-harness#1176 as a draft pull request.

My mistake. This was already tested successfully in ATH with jenkinsci/acceptance-test-harness#1173

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.

This PR is now ready for merge. We will merge it after approximately 24 hours if there is no negative feedback.

@MarkEWaite MarkEWaite added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label May 15, 2023
@MarkEWaite MarkEWaite self-assigned this May 15, 2023
.github/dependabot.yml Outdated Show resolved Hide resolved
Copy link
Member

@basil basil left a comment

Choose a reason for hiding this comment

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

#7477 seems to be holding up nicely.

@NotMyFault NotMyFault merged commit cb32f6f into jenkinsci:master May 16, 2023
16 checks passed
@NotMyFault NotMyFault deleted the guice-6 branch May 16, 2023 07:12
@NotMyFault NotMyFault removed the dependencies Pull requests that update a dependency file label May 16, 2023
@NotMyFault NotMyFault changed the title Move to Guice 6 Upgrade from Guice 5.1.0 to 6.0.0 May 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
java Pull requests that update Java code ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback rfe For changelog: Minor enhancement. use `major-rfe` for changes to be highlighted
Projects
None yet
4 participants