root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

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
This commit is contained in:
Andy Wilkinson 2016-02-24 16:46:04 +00:00
parent 1735fac3ab
commit 1c715ab282
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-dependencies/pom.xml
View File

@ -98,7 +98,7 @@
<jdom2.version>2.0.6</jdom2.version> <jdom2.version>2.0.6</jdom2.version>
<jedis.version>2.7.3</jedis.version> <jedis.version>2.7.3</jedis.version>
<jersey.version>2.22.2</jersey.version> <jersey.version>2.22.2</jersey.version>
<jetty.version>9.2.14.v20151106</jetty.version> <jetty.version>9.2.15.v20160210</jetty.version>
<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version> <jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
<jmustache.version>1.11</jmustache.version> <jmustache.version>1.11</jmustache.version>
<joda-time.version>2.8.2</joda-time.version> <joda-time.version>2.8.2</joda-time.version>

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2015 the original author or authors. * Copyright 2012-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -661,8 +661,7 @@ public class JettyEmbeddedServletContainerFactory
public HandlerWrapper createGzipHandler(Compression compression) { public HandlerWrapper createGzipHandler(Compression compression) {
GzipHandler gzipHandler = new GzipHandler(); GzipHandler gzipHandler = new GzipHandler();
gzipHandler.setMinGzipSize(compression.getMinResponseSize()); gzipHandler.setMinGzipSize(compression.getMinResponseSize());
gzipHandler.setMimeTypes( gzipHandler.addIncludedMimeTypes(compression.getMimeTypes());
new HashSet<String>(Arrays.asList(compression.getMimeTypes())));
if (compression.getExcludedUserAgents() != null) { if (compression.getExcludedUserAgents() != null) {
gzipHandler.setExcluded(new HashSet<String>( gzipHandler.setExcluded(new HashSet<String>(
Arrays.asList(compression.getExcludedUserAgents()))); Arrays.asList(compression.getExcludedUserAgents())));