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

[JENKINS-73135] Require Jenkins 2.472, adapt tests for Jetty 12 EE 8 #1678

Merged
merged 3 commits into from
Aug 13, 2024

Conversation

ampuscas
Copy link
Contributor

@ampuscas ampuscas commented Aug 13, 2024

JENKINS-73135 - Require Jenkins 2.472 or newer, adapt tests for Jetty 12 EE 8

Testing done

Automated tests pass on Linux with Java 21.

Submitter checklist

  • Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
  • Ensure that the pull request title represents the desired changelog entry
  • Please describe what you did
  • Link to relevant issues in GitHub or Jira
  • Link to relevant pull requests, esp. upstream and downstream changes
  • Ensure you have provided tests - that demonstrates feature works or fixes the issue

@github-actions github-actions bot added dependencies Pull requests that update a dependency file tests This PR adds/removes/updates test cases labels Aug 13, 2024
Also include a TODO comment to restore the jenkins.version based on jenkins.baseline once an LTS baseline is available that includes 2.472.
@MarkEWaite
Copy link
Contributor

Thanks for the pull request @ampuscas . I pushed two changes to the pull request so that it compiles and passes tests on my local installation. The comments in the changes should explain why I thought they would help. Refer to:

  • e7a0b08 - Use newer Jenkins LTS baseline for BOM
  • c169b4f - Format with spotless

@MarkEWaite
Copy link
Contributor

@krisstern I think that we should increment the minor number from 1.8.x to 1.9.0 when merging this pull request, because it changes the minimum Jenkins version and it switches from Java 11 compilation to Java 17 compilation. Does that match with your thinking or would you prefer something different?

We need to merge and release this before the plugin bill of materials release at the end of this week.

@MarkEWaite MarkEWaite changed the title [JENKINS-73135] adapt gitlab-plugin for jetty12 [JENKINS-73135] Require Jenkins 2.472 or newer and adapt gitlab-plugin for Jetty 12 Aug 13, 2024
@MarkEWaite MarkEWaite changed the title [JENKINS-73135] Require Jenkins 2.472 or newer and adapt gitlab-plugin for Jetty 12 [JENKINS-73135] Require Jenkins 2.472 or newer, adapt tests for Jetty 12 Aug 13, 2024
@MarkEWaite MarkEWaite changed the title [JENKINS-73135] Require Jenkins 2.472 or newer, adapt tests for Jetty 12 [JENKINS-73135] Require Jenkins 2.472 or newer, adapt tests for Jetty 12 EE 8 Aug 13, 2024
@MarkEWaite MarkEWaite changed the title [JENKINS-73135] Require Jenkins 2.472 or newer, adapt tests for Jetty 12 EE 8 [JENKINS-73135] Require Jenkins 2.472, adapt tests for Jetty 12 EE 8 Aug 13, 2024
Copy link

@raul-arabaolaza raul-arabaolaza left a comment

Choose a reason for hiding this comment

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

Code looks good to me, but I do not have an idea what is that jenkins.baseline property

@MarkEWaite
Copy link
Contributor

Code looks good to me, but I do not have an idea what is that jenkins.baseline property

It is used in the Jenkins plugin archetype and in many plugins to avoid duplicating the Jenkins version string in multiple locations. More information is available in:

@MarkEWaite MarkEWaite marked this pull request as ready for review August 13, 2024 17:43
@MarkEWaite MarkEWaite requested a review from a team as a code owner August 13, 2024 17:43
Copy link
Member

@krisstern krisstern left a comment

Choose a reason for hiding this comment

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

LGTM

@krisstern krisstern merged commit 68a2f37 into jenkinsci:master Aug 13, 2024
17 checks passed
@MarkEWaite
Copy link
Contributor

Thanks for merging @krisstern ! Are you able to release this as a new version so that it can be updated in the plugin BOM or would you prefer that I create the release?

Should the version number of the new release be 1.9.0 rather than the default of 1.8.3 because the Jenkins minimum version is increased?

@krisstern
Copy link
Member

Hi @MarkEWaite I am busy with something else now so if you are able to could you please create a new release? Thanks!

@MarkEWaite
Copy link
Contributor

Release 1.9.0 is building now.

@MarkEWaite
Copy link
Contributor

Release 1.9.0 is published.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore dependencies Pull requests that update a dependency file tests This PR adds/removes/updates test cases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants