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-75174] Move existing web.xml to web-fragment.xml under core #10185

Merged
merged 7 commits into from
Jan 29, 2025

Conversation

Vlatombe
Copy link
Member

@Vlatombe Vlatombe commented Jan 21, 2025

As this impacts only EOM integrators (CloudBees), I deliberately omitted changelog. Please let me know if you think otherwise.

Plugin authors : if you intend to depend on a Jenkins version including this change, you must use a compatible version of jenkins-test-harness. The easies way for that is to use plugin parent pom 5.6 or later.

See JENKINS-75174.

Testing done

Proposed changelog entries

  • Developer: to test plugins against this Jenkins version, please update plugin parent pom to version 5.6 or later.

Proposed upgrade guidelines

N/A

Submitter checklist

Preview Give feedback

Desired reviewers

@mention

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

Maintainer checklist

Preview Give feedback

@Vlatombe Vlatombe added skip-changelog Should not be shown in the changelog developer Changes which impact plugin developers labels Jan 21, 2025
@Vlatombe Vlatombe requested a review from jglick January 21, 2025 13:31
@github-actions github-actions bot added the unresolved-merge-conflict There is a merge conflict with the target branch. label Jan 21, 2025
Copy link
Contributor

Please take a moment and address the merge conflicts of your pull request. Thanks!

@timja
Copy link
Member

timja commented Jan 22, 2025

Noting that plugins using a Jenkins version including this change will need to use the jth version mentioned above or later.

Does this affect PCT? i.e is a bom build needed?

@Vlatombe
Copy link
Member Author

Vlatombe commented Jan 22, 2025

is a bom build needed ?

Yes, I will need a patch on pct repo as well to pick up jenkinsci/jenkins-test-harness#899

Copy link
Member

@jglick jglick left a comment

Choose a reason for hiding this comment

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

Pity that Git rename detection fails when you keep a relatively unrelated file under the original name.

@github-actions github-actions bot added unresolved-merge-conflict There is a merge conflict with the target branch. and removed unresolved-merge-conflict There is a merge conflict with the target branch. labels Jan 23, 2025
Copy link
Contributor

Please take a moment and address the merge conflicts of your pull request. Thanks!

@github-actions github-actions bot removed the unresolved-merge-conflict There is a merge conflict with the target branch. label Jan 24, 2025
@Vlatombe
Copy link
Member Author

This change would need a BOM build with jenkinsci/plugin-compat-tester#746

Vlatombe added a commit to Vlatombe/bom that referenced this pull request Jan 27, 2025
@Vlatombe
Copy link
Member Author

jenkinsci/bom#4323

@Vlatombe Vlatombe marked this pull request as ready for review January 27, 2025 13:31
@Vlatombe
Copy link
Member Author

Ideally a release of https://github.com/jenkinsci/plugin-pom should be cut, in order to maximize plugin compatibility with this change and avoid surprises as plugin authors will pick up this jenkins line.

@timja
Copy link
Member

timja commented Jan 27, 2025

Ideally a release of jenkinsci/plugin-pom should be cut, in order to maximize plugin compatibility with this change and avoid surprises as plugin authors will pick up this jenkins line.

you should be able to do that?

@Vlatombe Vlatombe requested a review from a team January 28, 2025 13:00
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.

/label ready-for-merge


This PR is now ready for merge, after ~24 hours, we will merge it if there's no negative feedback.

Thanks!

@comment-ops-bot comment-ops-bot bot added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Jan 28, 2025
@Vlatombe Vlatombe removed the skip-changelog Should not be shown in the changelog label Jan 28, 2025
Copy link

@A1exKH A1exKH 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 365d03e into jenkinsci:master Jan 29, 2025
16 checks passed
@Vlatombe Vlatombe deleted the web-fragments branch January 29, 2025 16:01
timja added a commit to timja/jenkins that referenced this pull request Jan 30, 2025
… under core (jenkinsci#10185)"

This reverts commit 365d03e, reversing
changes made to 5aca30a.
timja added a commit that referenced this pull request Jan 31, 2025
Vlatombe added a commit to Vlatombe/jenkins that referenced this pull request Jan 31, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
developer Changes which impact plugin developers ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants