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

Introduce new hook when jetty 12 hook doesn't trigger #746

Merged
merged 9 commits into from
Jan 24, 2025

Conversation

Vlatombe
Copy link
Member

@Vlatombe Vlatombe commented Jan 22, 2025

jenkinsci/jenkins#10185 will introduce usage of web fragments in Jenkins. In order to plugins to keep passing through PCT, a version of jenkins-test-harness that configures the Jetty instance properly is needed.

This refines the existing Jetty 12 hook to pick a version of JTH that stays compatible with the level of servlet API that works with the plugin, while picking up the small change of configuration required to make web fragments work.

Testing done

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

@Vlatombe Vlatombe changed the title Introduce new when jetty 12 hook doesn't trigger Introduce new hook when jetty 12 hook doesn't trigger Jan 23, 2025
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.

LGTM, though this is starting to get really complicated. In the long term I would like to more simply upgrade the test harness and HPI plugins to recent versions if they are too old without much of the additional complexity here, but I think we are pretty far away from that right now with many BOM plugins using old parent POMs and core versions. That might change once we move more things to EE 9.


@Override
public void action(@NonNull BeforeExecutionContext context) throws PluginCompatibilityTesterException {
var version = getPropertyAsVersion(context, PROPERTY_NAME);
Copy link
Member

Choose a reason for hiding this comment

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

Don't forget to call super.action() and/or super.check() if needed.

Copy link
Member Author

Choose a reason for hiding this comment

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

Not needed.

@jglick jglick merged commit 44cae36 into jenkinsci:master Jan 24, 2025
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants