Jetty 10 based JenkinsRule
#453
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jglick
reviewed
Jul 6, 2022
| @@ -543,6 +546,7 @@ protected ServletContext createWebServer() throws Exception { | |||
| context.setConfigurations(new Configuration[]{new WebXmlConfiguration()}); | |||
| context.addBean(new NoListenerConfiguration(context)); | |||
| server.setHandler(context); | |||
| JettyWebSocketServletContainerInitializer.configure(context, null); | |||
There was a problem hiding this comment.
6 tasks
basil
force-pushed
the
jetty10
branch
2 times, most recently
from
b4f70c0
to
371410d
Compare
This was referenced Jul 7, 2022
basil
added a commit
to basil/bom
that referenced
this pull request
Jul 8, 2022
basil
added a commit
to basil/bom
that referenced
this pull request
Jul 8, 2022
basil
added a commit
to basil/bom
that referenced
this pull request
Jul 8, 2022
basil
added a commit
to basil/bom
that referenced
this pull request
Jul 8, 2022
basil
added a commit
to basil/bom
that referenced
this pull request
Jul 8, 2022
Merged
12 tasks
6 tasks
|
Still need to move |
jglick
reviewed
Dec 12, 2022
| @@ -796,6 +799,7 @@ public static ImmutablePair<Server, ServletContext> _createWebServer(String cont | |||
| context.setConfigurations(new Configuration[]{new WebXmlConfiguration()}); | |||
| context.addBean(new NoListenerConfiguration(context)); | |||
| server.setHandler(context); | |||
| JettyWebSocketServletContainerInitializer.configure(context, null); | |||
There was a problem hiding this comment.
@basil FYI this JTH release breaks a WebSocket test in the kubernetes plugin:
java.lang.NullPointerException: Cannot invoke "org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer.upgrade(org.eclipse.jetty.websocket.server.JettyWebSocketCreator, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)" because the return value of "org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer.getContainer(javax.servlet.ServletContext)" is null
at jenkins.websocket.Jetty10Provider.handle(Jetty10Provider.java:61)
at jenkins.websocket.WebSockets.lambda$upgrade$0(WebSockets.java:70)
I am still trying to understand why; in the meantime, jenkinsci/kubernetes-plugin@dcc8137
There was a problem hiding this comment.
Ah, never mind, I think this is due to a stale copy in that plugin (#289 (comment)).
There was a problem hiding this comment.
Glad to hear it, especially given that I tested this case by running the Swarm plugin's JenkinsRule-based tests (which use WebSocket) against this PR prior to its merge and release.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Now that the test harness requires Java 11, we can move to a Jetty 10 baed
JenkinsRule. To test this I ran the Swarm plugin tests as well as a subset of core tests with this PR. I also verified that this PR, once widely adopted, will allow us to remove Jetty 9 support from core.