[JENKINS-73126] Upgrade Winstone from Jetty 10.x to 12.x (EE 8) #383
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
force-pushed
the
prototype
branch
5 times, most recently
from
31a91d5 to
a07086b
Compare
basil
changed the title
basil
force-pushed
the
prototype
branch
3 times, most recently
from
01a7059 to
e8a0d5a
Compare
basil
force-pushed
the
prototype
branch
2 times, most recently
from
1a58a64 to
2ac4f2e
Compare
Closed
basil
force-pushed
the
prototype
branch
2 times, most recently
from
c86a891 to
fc72a87
Compare
basil
changed the title
basil
force-pushed
the
prototype
branch
4 times, most recently
from
8f9940a to
760fa67
Compare
basil
force-pushed
the
prototype
branch
2 times, most recently
from
abde36f to
4ac932a
Compare
Co-authored-by: Olivier Lamy <[email protected]>
MarkEWaite
approved these changes
Aug 8, 2024
basil
commented
Aug 8, 2024
| @@ -55,7 +52,6 @@ public class HostConfiguration { | |||
| private Map<String, String> args; | |||
| private Map<String, WebAppContext> webapps; | |||
| private ClassLoader commonLibCL; | |||
| private MimeTypes mimeTypes = new MimeTypes(); | |||
There was a problem hiding this comment.
Note that we are no longer replacing the default MIME types, but appending to them. As a result, we have deleted any MIME mappings that are already present in upstream Jetty and added a test to ensure that we are only adding to the existing MIME types rather than attempting to replace them.
| public ErrorCollector errors = new ErrorCollector(); | ||
|
|
||
| @Test | ||
| public void mimeTypes() throws IOException { |
There was a problem hiding this comment.
This test ensures that we are only ever adding to the Jetty default MIME types, never replacing them. When upstream Jetty has a MIME type, we want to use it whenever possible. This is not only so that we have less code to maintain, but also so that we avoid bugs like JENKINS-73381.
BorisYaoA
approved these changes
Aug 9, 2024
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.
Replace dependencies with EE 8 versions in
pom.xmland update all relevant imports.Testing done
Full PCT/ATH