[JENKINS-68694] Winstone 6.0: Upgrade Jetty from 9.4.46.v20220331 to 10.0.11 #6694
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
basil
added
the
work-in-progress
basil
commented
Jun 30, 2022
bom/pom.xml
Outdated
| @@ -40,7 +40,8 @@ THE SOFTWARE. | |||
| <properties> | |||
| <asm.version>9.3</asm.version> | |||
| <slf4jVersion>1.7.36</slf4jVersion> | |||
| <stapler.version>1685.v3b_5035c4ce05</stapler.version> | |||
| <!-- TODO https://github.com/jenkinsci/stapler/pull/305 --> | |||
basil
changed the title
basil
added
rfe
basil
commented
Jun 30, 2022
| @@ -40,7 +40,7 @@ THE SOFTWARE. | |||
| <properties> | |||
| <asm.version>9.3</asm.version> | |||
| <slf4jVersion>1.7.36</slf4jVersion> | |||
| <stapler.version>1685.v3b_5035c4ce05</stapler.version> | |||
| <stapler.version>1711.v5b_1b_03f0fcf2</stapler.version> | |||
| <version>3.1.0</version> | ||
| <groupId>jakarta.servlet</groupId> | ||
| <artifactId>jakarta.servlet-api</artifactId> | ||
| <version>4.0.4</version> |
There was a problem hiding this comment.
| @@ -500,7 +500,7 @@ THE SOFTWARE. | |||
| <plugin> | |||
| <groupId>org.eclipse.jetty</groupId> | |||
| <artifactId>jetty-maven-plugin</artifactId> | |||
| <version>9.4.46.v20220331</version> | |||
| <version>10.0.11</version> | |||
There was a problem hiding this comment.
Comment on lines
+89
to
+90
| <groupId>jakarta.servlet.jsp</groupId> | ||
| <artifactId>jakarta.servlet.jsp-api</artifactId> |
There was a problem hiding this comment.
| @@ -16,7 +16,7 @@ updates: | |||
| # Provided by Jetty and should be aligned with the version provided by the | |||
| # version of Jetty we deliver. See: | |||
| # https://github.com/jenkinsci/jenkins/pull/5211 | |||
| - dependency-name: "javax.servlet:javax.servlet-api" | |||
| - dependency-name: "jakarta.servlet:jakarta.servlet-api" | |||
There was a problem hiding this comment.
This is misleading to me. The most common and generally recommended format is PKCS12, in Java 9 the default keystore type was changed to it. I would instead say takes a "KeyStore", possibly adding (PKCS12 is the recommended type) |
|
Based on JEP 229, I have updated the proposed upgrade guidelines to read:
|
timja
approved these changes
Jul 1, 2022
NotMyFault
approved these changes
Jul 2, 2022
|
This PR is now ready for merge. We will merge it after approximately 24 hours if there is no negative feedback. Please see the merge process documentation for more information about the merge process. Thanks! |
basil
added
the
ready-for-merge
|
Starting with the merged commit, about every other invocation of |
@daniel-beck No. You are hitting jetty/jetty.project#7970. I was able to chase the problem away by removing the |
|
Caused https://issues.jenkins.io/browse/JENKINS-68928 (I also hit the issue mentioned above jetty/jetty.project#7970) |
|
This appears to drop WebSocket support for agents. 2.358-rc32509.a_b_a_473fd8cf7 works, and 2.358-rc32516.ea_3017ea_85a_1 does not.
|
|
Noting from IRC: @timja noticed is now in a different package, but changing that line alone doesn't fix it. |
|
Filed on Jira as https://issues.jenkins.io/browse/JENKINS-68933 |
6 tasks
|
Thanks Daniel, I thought this was covered by test automation in |
basil
added a commit
to basil/jenkins
that referenced
this pull request
Jul 5, 2022
basil
added a commit
to basil/jenkins
that referenced
this pull request
Jul 5, 2022
…0331 to 10.0.11 (jenkinsci#6694)" This reverts commit ea3017e.
basil
added
skip-changelog
timja
added a commit
to timja/jenkins
that referenced
this pull request
Jul 5, 2022
…0331 to 10.0.11 (jenkinsci#6694)" This reverts commit ea3017e.
This was referenced Jul 5, 2022
13 tasks
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.
See JENKINS-68694. Jetty 10.0.x implements Servlet 4.0 (JakartaEE 8/
javax.servlet.*). The minimum required Java version for Jetty 10 is now Java 11. For more details about the Jetty 10 release, see this Jetty blog post. Winstone 6.0 removes support for OpenSSL-style PEM-encoded RSA private keys in jenkinsci/winstone#232.Testing done
--httpsKeyStore,--httpsKeyStorePassword, and--httpsPort; visited the UI in my browser via TLS and clicked around successfully; build Freestyle and Pipeline jobs; verified Winstone 6.0 is displayed in the About page.jenkins.warbefore and after this change; verified that no unexpected JAR files had been added to or removed from the WAR archive.Proposed changelog entries
n/a, being reverted in #6781
Proposed upgrade guidelines
n/a, being reverted in #6781
Submitter checklist
Proposed changelog entriessection only if there are breaking changes or other changes which may require extra steps from users during the upgrade@Restrictedor have@since TODOJavadoc, as appropriate.@Deprecated(since="TODO")or@Deprecated(since="TODO", forRemoval=true)if applicable.Desired reviewers
@mention
Maintainer checklist
Before the changes are marked as
ready-for-merge:Proposed changelog entriesare accurate, human-readable, and in the imperative moodupgrade-guide-neededlabel is set and there is aProposed upgrade guidelinessection in the PR title. (example)lts-candidateto be considered (see query).