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

Revert "[JENKINS-75174] Move existing web.xml to web-fragment.xml under core (#10185)" #10225

Merged
merged 1 commit into from
Jan 31, 2025

Conversation

timja
Copy link
Member

@timja timja commented Jan 30, 2025

This reverts commit 365d03e, reversing
changes made to 5aca30a.

This PR broke mvn jetty:run, it just hung without starting. Spent awhile thinking it was an issue with my machine or a change I had -.-

See JENKINS-XXXXX.

Testing done

Proposed changelog entries

  • human-readable text

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

… under core (jenkinsci#10185)"

This reverts commit 365d03e, reversing
changes made to 5aca30a.
@timja timja added the skip-changelog Should not be shown in the changelog label Jan 30, 2025
@timja timja requested a review from a team January 30, 2025 23:00
@basil
Copy link
Member

basil commented Jan 31, 2025

Looks like jenkinsci/jenkins-test-harness#899 needs to be side-ported to somewhere near https://github.com/jenkinsci/maven-hpi-plugin/blob/d75d6396318fbc1b6ed7363849d57add24422ac0/src/main/java/org/jenkinsci/maven/plugins/hpi/RunMojo.java#L618. While normally I swear by Jeff Bonwick's eternal words of "If it's broken, rip it out", it might not be too much effort to roll forward in this case.

@timja
Copy link
Member Author

timja commented Jan 31, 2025

Looks like jenkinsci/jenkins-test-harness#899 needs to be side-ported to somewhere near jenkinsci/maven-hpi-plugin@d75d639/src/main/java/org/jenkinsci/maven/plugins/hpi/RunMojo.java#L618. While normally I swear by Jeff Bonwick's eternal words of "If it's broken, rip it out", it might not be too much effort to roll forward in this case.

right now it breaks building / running Jenkins core in development mode and plugins depending on current weekly, we can reapply once ready easily.

@timja timja merged commit 6109053 into jenkinsci:master Jan 31, 2025
15 checks passed
@timja timja deleted the revert-web-fragment-change branch January 31, 2025 08:18
@timja
Copy link
Member Author

timja commented Jan 31, 2025

FYI @Vlatombe

@Vlatombe
Copy link
Member

Ack, sorry I forgot to check this use case.

@timja
Copy link
Member Author

timja commented Jan 31, 2025

Looks like jenkinsci/jenkins-test-harness#899 needs to be side-ported to somewhere near jenkinsci/maven-hpi-plugin@d75d639/src/main/java/org/jenkinsci/maven/plugins/hpi/RunMojo.java#L618. While normally I swear by Jeff Bonwick's eternal words of "If it's broken, rip it out", it might not be too much effort to roll forward in this case.

Maven hpi plugin isn't used in core so I don't think this would fix it?

Both jetty:run and hpi:run are broken

Vlatombe added a commit to Vlatombe/jenkins that referenced this pull request Jan 31, 2025
@Vlatombe
Copy link
Member

jetty:run -> #10227
hpi:run -> jenkinsci/maven-hpi-plugin#710

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip-changelog Should not be shown in the changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants