You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/07/11 16:03:15 UTC
[1/2] wicket git commit: Update Log4j2 to 2.6.2
Repository: wicket
Updated Branches:
refs/heads/master fd2ce6b38 -> fc8b23ebb
Update Log4j2 to 2.6.2
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/be4a1295
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/be4a1295
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/be4a1295
Branch: refs/heads/master
Commit: be4a12959fca7dfd24346af5a87c8cac399911df
Parents: fd2ce6b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jul 11 11:45:56 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jul 11 11:45:56 2016 +0200
----------------------------------------------------------------------
.../quickstart/src/main/resources/archetype-resources/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/be4a1295/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
index 1bd68e1..3dbc777 100644
--- a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
@@ -44,7 +44,7 @@
<properties>
<wicket.version>8.0.0-SNAPSHOT</wicket.version>
<jetty9.version>9.3.8.v20160314</jetty9.version>
- <log4j.version>2.6.1</log4j.version>
+ <log4j.version>2.6.2</log4j.version>
<junit.version>4.12</junit.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- allowed values: R7, 1.0, 1.5, 2.0 or none -->
[2/2] wicket git commit: Minor improvements in the javadoc and Maven
pom.xml for HTTP2 modules
Posted by mg...@apache.org.
Minor improvements in the javadoc and Maven pom.xml for HTTP2 modules
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/fc8b23eb
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fc8b23eb
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fc8b23eb
Branch: refs/heads/master
Commit: fc8b23ebb0b9ab35809fa67476de1069043f1680
Parents: be4a129
Author: Martin Grigorov (Netwalk) <ma...@valtech.de>
Authored: Mon Jul 11 17:41:25 2016 +0200
Committer: Martin Grigorov (Netwalk) <ma...@valtech.de>
Committed: Mon Jul 11 17:41:25 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/http2/markup/head/PushBuilder.java | 2 --
wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml | 4 ++--
.../src/main/java/org/apache/wicket/http2/Initializer.java | 6 ++----
.../org/apache/wicket/http2/markup/head/Jetty9PushBuilder.java | 6 +-----
.../src/main/java/org/apache/wicket/http2/Initializer.java | 4 +---
.../apache/wicket/http2/markup/head/Tomcat85PushBuilder.java | 4 +---
wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml | 2 +-
.../apache/wicket/http2/markup/head/UndertowPushBuilder.java | 2 +-
8 files changed, 9 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/fc8b23eb/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushBuilder.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushBuilder.java b/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushBuilder.java
index 75a4fd9..7f1eccd 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushBuilder.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushBuilder.java
@@ -20,8 +20,6 @@ import javax.servlet.http.HttpServletRequest;
/**
* Used to delegate the push call to the vendor specific push builder API
- *
- * @author Martin Grigorov
*/
public interface PushBuilder
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/fc8b23eb/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml b/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml
index 84f81d4..c9819e5 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml
+++ b/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml
@@ -42,8 +42,8 @@
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<version>9.3.9.M1</version>
- <type>POM</type>
- <scope>compile</scope>
+ <type>pom</type>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/wicket/blob/fc8b23eb/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/Initializer.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/Initializer.java b/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/Initializer.java
index b2886b1..f4596bc 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/Initializer.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/Initializer.java
@@ -21,15 +21,13 @@ import org.apache.wicket.IInitializer;
import org.apache.wicket.http2.markup.head.Jetty9PushBuilder;
/**
- * Initializes the jetty specific push builder API and makes it available through the http2
+ * Initializes the jetty specific push builder API and makes it available through the HTTP2
* settings
- *
- * @author Martin Grigorov
*/
public class Initializer implements IInitializer
{
/**
- * Initializes the push builder API of jetty
+ * Initializes the push builder API of Jetty 9.3+
*/
@Override
public void init(Application application)
http://git-wip-us.apache.org/repos/asf/wicket/blob/fc8b23eb/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/markup/head/Jetty9PushBuilder.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/markup/head/Jetty9PushBuilder.java b/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/markup/head/Jetty9PushBuilder.java
index f5d34cf..90bd10f 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/markup/head/Jetty9PushBuilder.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/markup/head/Jetty9PushBuilder.java
@@ -22,16 +22,12 @@ import org.apache.wicket.request.Request;
import org.apache.wicket.request.cycle.RequestCycle;
/**
- * Allows to push resources with the jetty specific push builder API
+ * Allows to push resources with the Jetty 9.3+ specific push builder API
*
- * @author Martin Grigorov
* @author Tobias Soloschenko
*/
public class Jetty9PushBuilder implements PushBuilder
{
- /**
- * @see {@link org.apache.wicket.http2.markup.head.PushBuilder}
- */
@Override
public void push(HttpServletRequest httpServletRequest, String... paths)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/fc8b23eb/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/Initializer.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/Initializer.java b/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/Initializer.java
index 9ba9ded..0865e3e 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/Initializer.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/Initializer.java
@@ -21,10 +21,8 @@ import org.apache.wicket.IInitializer;
import org.apache.wicket.http2.markup.head.Tomcat85PushBuilder;
/**
- * Initializes the tomcat specific push builder API and makes it available through the http2
+ * Initializes the tomcat specific push builder API and makes it available through the HTTP2
* settings
- *
- * @author Martin Grigorov
*/
public class Initializer implements IInitializer
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/fc8b23eb/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 9a27c73..141a296 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
@@ -22,9 +22,7 @@ import org.apache.wicket.request.Request;
import org.apache.wicket.request.cycle.RequestCycle;
/**
- * Allows to push resources with the tomcat specific push builder API
- *
- * @author Martin Grigorov
+ * Allows to push resources with the Tomcat 8.5+ specific push builder API
*/
public class Tomcat85PushBuilder implements PushBuilder
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/fc8b23eb/wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml b/wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml
index ba505d3..a56171a 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml
+++ b/wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml
@@ -29,7 +29,7 @@
<description>
Wicket\u2019s implementation to use the PushBuilder API
to serve resource via http/2 with less requests. This
- is the Apache Tomcat 8.5+ implementation to resolve the PushBuilder API and
+ is the Undertow 2+ implementation to resolve the PushBuilder API and
provide the IInitializer.
</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/fc8b23eb/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/UndertowPushBuilder.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/UndertowPushBuilder.java b/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/UndertowPushBuilder.java
index 6f308fe..0d8afa0 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/UndertowPushBuilder.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/UndertowPushBuilder.java
@@ -22,7 +22,7 @@ import org.apache.wicket.request.Request;
import org.apache.wicket.request.cycle.RequestCycle;
/**
- * Allows to push resources with the undertow specific push builder API
+ * Allows to push resources with the Undertow 2+ specific push builder API
*
* @author Tobias Soloschenko
*/