Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[JENKINS-73133] Adapt GitHub for Jetty 12 (EE 8) #380

Merged
merged 1 commit into from
Aug 9, 2024

Conversation

basil
Copy link
Member

@basil basil commented May 22, 2024

See JENKINS-73133. Starting on Tuesday, August 13, the 2.472 weekly release will contain Jetty 12 EE 8. For this plugin to continue to be testable in PCT (Plugin Compatibility Tester) with the upcoming 2.472 weekly release, we must adapt its test suite to work on Jetty 12 EE 8, including merging and releasing this PR.

@basil basil force-pushed the prototype branch 2 times, most recently from 671e95c to b64cdf2 Compare June 21, 2024 16:12
@basil basil changed the title Incremental build for testing [JENKINS-73135] Adapt GitLab for Jetty 12 (EE 8) Jun 21, 2024
@basil basil changed the title [JENKINS-73135] Adapt GitLab for Jetty 12 (EE 8) [JENKINS-73132] Adapt GitHub for Jetty 12 (EE 8) Jun 21, 2024
@basil basil changed the title [JENKINS-73132] Adapt GitHub for Jetty 12 (EE 8) [JENKINS-73133] Adapt GitHub for Jetty 12 (EE 8) Jun 21, 2024
Comment on lines +57 to +59
<!-- TODO JENKINS-73339 until in parent POM -->
<jenkins-test-harness.version>2250.v03a_1295b_0a_30</jenkins-test-harness.version>
<maven.compiler.testRelease>17</maven.compiler.testRelease>
Copy link
Member Author

Choose a reason for hiding this comment

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

Temporary change to run tests with Jetty 12 (which requires Java 17). Note that PCT (Plugin Compatibility Tester) automatically applies these changes when this plugin is tested in jenkinsci/bom against a Jenkins core that contains Jetty 12 (e.g., the 2.472 pre-release, or the 2.472 weekly release that is scheduled for next Tuesday, August 13).

Comment on lines +17 to +19
import org.eclipse.jetty.ee8.servlet.DefaultServlet;
import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
import org.eclipse.jetty.ee8.servlet.ServletHolder;
Copy link
Member Author

Choose a reason for hiding this comment

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

Jetty 11 and older were tied to a particular Servlet API version, but Jetty 12 and newer features a modular architecture that allow Jetty to be used with any Servlet API version. For EE 8, the classes have now been moved to these packages.

This is needed for this plugin's test suite to work against Jetty 12 EE 8, which PCT will start running after the 2.472 weekly release on Tuesday, August 13.

@basil basil marked this pull request as ready for review August 8, 2024 21:06
@basil
Copy link
Member Author

basil commented Aug 8, 2024

The CI build is green.

@KostyaSha Can this PR please be merged and released before (or shortly after) the Jenkins 2.472 weekly release, currently scheduled for Tuesday, August 13?

@KostyaSha KostyaSha merged commit 9a5d9f2 into jenkinsci:master Aug 9, 2024
14 checks passed
@basil
Copy link
Member Author

basil commented Aug 9, 2024

Thank you very much!

@basil basil deleted the prototype branch August 9, 2024 17:18
@KostyaSha
Copy link
Member

you are welcome

# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants