Repository: wicket Updated Branches: refs/heads/master 260a48356 -> 1cec46206
WICKET-6390 Update Tomcat to 8.5.15 to get the latest HTTP2 features and APIs Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1cec4620 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1cec4620 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1cec4620 Branch: refs/heads/master Commit: 1cec46206760436fff17b4879ac617dd1727baee Parents: 260a483 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Jun 1 21:24:26 2017 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Jun 1 21:24:26 2017 +0200 ---------------------------------------------------------------------- wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml | 2 +- .../org/apache/wicket/http2/markup/head/Tomcat85PushBuilder.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/1cec4620/wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml b/wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml index ea8effd..e46c04a 100644 --- a/wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml +++ b/wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml @@ -40,7 +40,7 @@ <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-catalina</artifactId> - <version>8.5.12</version> + <version>8.5.15</version> <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/wicket/blob/1cec4620/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/Tomcat85PushBuilder.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/Tomcat85PushBuilder.java b/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/Tomcat85PushBuilder.java index 8dfba97..d0ab39d 100644 --- a/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/Tomcat85PushBuilder.java +++ b/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/Tomcat85PushBuilder.java @@ -36,7 +36,7 @@ public class Tomcat85PushBuilder implements PushBuilder Request request = RequestCycle.get().getRequest(); HttpServletRequest httpRequest = (HttpServletRequest) request.getContainerRequest(); org.apache.catalina.connector.RequestFacade tomcatRequest = (org.apache.catalina.connector.RequestFacade) httpRequest; - org.apache.catalina.servlet4preview.http.PushBuilder pushBuilder = tomcatRequest.getPushBuilder(); + org.apache.catalina.servlet4preview.http.PushBuilder pushBuilder = tomcatRequest.newPushBuilder(); if (pushBuilder != null) { for (String path : paths)
