Skip to content

Commit 1c715ab

Browse files
committed
Upgrade to Jetty 9.2.15.v20160210
Upgrade to Jetty 9.2.15 and replace use of API that was deprecated and changed to throw an UnsupportedOperationException in the same release. Closes gh-5218
1 parent 1735fac commit 1c715ab

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

spring-boot-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<jdom2.version>2.0.6</jdom2.version>
9999
<jedis.version>2.7.3</jedis.version>
100100
<jersey.version>2.22.2</jersey.version>
101-
<jetty.version>9.2.14.v20151106</jetty.version>
101+
<jetty.version>9.2.15.v20160210</jetty.version>
102102
<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
103103
<jmustache.version>1.11</jmustache.version>
104104
<joda-time.version>2.8.2</joda-time.version>

spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2015 the original author or authors.
2+
* Copyright 2012-2016 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -661,8 +661,7 @@ private static class Jetty92GzipHandlerFactory implements GzipHandlerFactory {
661661
public HandlerWrapper createGzipHandler(Compression compression) {
662662
GzipHandler gzipHandler = new GzipHandler();
663663
gzipHandler.setMinGzipSize(compression.getMinResponseSize());
664-
gzipHandler.setMimeTypes(
665-
new HashSet<String>(Arrays.asList(compression.getMimeTypes())));
664+
gzipHandler.addIncludedMimeTypes(compression.getMimeTypes());
666665
if (compression.getExcludedUserAgents() != null) {
667666
gzipHandler.setExcluded(new HashSet<String>(
668667
Arrays.asList(compression.getExcludedUserAgents())));

0 commit comments

Comments
 (0)