Merge branch 'pr-227-push_issue_fix'

Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5ec319ff
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5ec319ff
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5ec319ff

Branch: refs/heads/master
Commit: 5ec319ff46b862204f4c7fe56dc9b298fd495a8d
Parents: 549ff63 8353b35
Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org>
Authored: Sun Aug 6 14:58:36 2017 +0300
Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org>
Committed: Sun Aug 6 14:58:36 2017 +0300

----------------------------------------------------------------------
 pom.xml                                         |   4 +-
 .../http2/markup/head/NoopPushBuilder.java      |   2 +-
 .../wicket/http2/markup/head/PushBuilder.java   |   6 +-
 .../http2/markup/head/PushHeaderItem.java       |  59 +++++++---
 .../wicket/http2/markup/head/PushItem.java      | 117 +++++++++++++++++--
 .../http2/markup/head/PushItemHeaderValue.java  | 101 ++++++++++++++++
 .../http2/markup/head/Jetty9PushBuilder.java    |  19 ++-
 .../wicket-http2/wicket-http2-tomcat/pom.xml    |   2 +-
 .../http2/markup/head/Tomcat85PushBuilder.java  |  17 ++-
 .../http2/markup/head/UndertowPushBuilder.java  |  17 ++-
 .../main/asciidoc/http2push/http2push_1.adoc    |   4 +-
 11 files changed, 303 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/5ec319ff/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index fdbc63e,fdbc63e..ac0df56
--- a/pom.xml
+++ b/pom.xml
@@@ -153,7 -153,7 +153,7 @@@
                        <dependency>
                                <groupId>com.google.guava</groupId>
                                <artifactId>guava</artifactId>
--                              <version>22.0</version>
++                              <version>23.0</version>
                        </dependency>
                        <dependency>
                                <groupId>javax.el</groupId>
@@@ -754,7 -754,7 +754,7 @@@
                                <plugin>
                                        
<groupId>org.apache.maven.plugins</groupId>
                                        
<artifactId>maven-compiler-plugin</artifactId>
--                                      <version>3.6.1</version>
++                                      <version>3.6.2</version>
                                        <inherited>true</inherited>
                                </plugin>
                                <plugin>

Reply via email to