You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by so...@apache.org on 2017/10/03 12:37:27 UTC
[1/5] wicket git commit: Use ApplicationPushBuilder instead of
org.apache.catalina.servlet4preview.http.PushBuilder because it will be
removed in Tomcat
Repository: wicket
Updated Branches:
refs/heads/WICKET-6105-java.time fc89108e9 -> 66f8f2aec
Use ApplicationPushBuilder instead of org.apache.catalina.servlet4preview.http.PushBuilder because it will be removed in Tomcat
http://markmail.org/message/hf65x4ko4ro5lvus
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/35a7d6d5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/35a7d6d5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/35a7d6d5
Branch: refs/heads/WICKET-6105-java.time
Commit: 35a7d6d5f9877b02bb2e6292b5b03533dc87d817
Parents: 77d8bf3
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Sep 28 12:15:25 2017 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Sep 28 12:15:25 2017 +0300
----------------------------------------------------------------------
.../org/apache/wicket/http2/markup/head/Tomcat85PushBuilder.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/35a7d6d5/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 1aac741..32faf6b 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
@@ -18,6 +18,7 @@ package org.apache.wicket.http2.markup.head;
import javax.servlet.http.HttpServletRequest;
+import org.apache.catalina.core.ApplicationPushBuilder;
import org.apache.wicket.http2.markup.head.PushItemHeaderValue.HeaderOperation;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -37,7 +38,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.newPushBuilder();
+ ApplicationPushBuilder pushBuilder = (ApplicationPushBuilder) tomcatRequest.newPushBuilder();
if (pushBuilder != null)
{
for (PushItem pushItem : pushItems)
[3/5] wicket git commit: INFRA-15013 VM for Apache Wicket
Posted by so...@apache.org.
INFRA-15013 VM for Apache Wicket
Rename 8.x Docker image label to LATEST-8.
Remove useless debug port.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/05aa3e88
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/05aa3e88
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/05aa3e88
Branch: refs/heads/WICKET-6105-java.time
Commit: 05aa3e883dd86a05416312e1f728dd129cbd2734
Parents: 49df0e5
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Sep 29 09:55:21 2017 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Sep 29 09:55:21 2017 +0300
----------------------------------------------------------------------
wicket-examples/pom.xml | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/05aa3e88/wicket-examples/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml
index 979075f..76366e2 100644
--- a/wicket-examples/pom.xml
+++ b/wicket-examples/pom.xml
@@ -275,7 +275,6 @@
</pluginManagement>
</build>
-
<profiles>
<profile>
<id>docker</id>
@@ -286,7 +285,7 @@
<artifactId>docker-maven-plugin</artifactId>
<version>${docker-maven-plugin.version}</version>
<configuration>
- <imageName>apache-docker-wicket-docker.bintray.io/wicket-examples:${project.version}</imageName>
+ <imageName>apache-docker-wicket-docker.bintray.io/wicket-examples:LATEST-8</imageName>
<baseImage>tomcat:8.5-jre8-alpine</baseImage>
<resources>
<resource>
@@ -297,13 +296,8 @@
</resources>
<forceTags>true</forceTags>
<imageTags>
- <imageTag>${project.version}</imageTag>
- <imageTag>latest</imageTag>
+ <imageTag>LATEST-8</imageTag>
</imageTags>
- <exposes>
- <!-- for debugging the application inside Tomcat -->
- <expose>45555</expose>
- </exposes>
</configuration>
<executions>
<execution>
[5/5] wicket git commit: Merge remote-tracking branch 'origin/master'
into WICKET-6105-java.time
Posted by so...@apache.org.
Merge remote-tracking branch 'origin/master' into WICKET-6105-java.time
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/66f8f2ae
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/66f8f2ae
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/66f8f2ae
Branch: refs/heads/WICKET-6105-java.time
Commit: 66f8f2aeca8ec19df43a11bd6114d6fe006cbc31
Parents: fc89108 58a7106
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Tue Oct 3 19:36:21 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Tue Oct 3 19:36:21 2017 +0700
----------------------------------------------------------------------
release.sh | 12 ++++--------
wicket-examples/pom.xml | 10 ++--------
.../wicket/http2/markup/head/Tomcat85PushBuilder.java | 3 ++-
.../wicket/protocol/ws/util/tester/WebSocketTester.java | 10 ++++++++--
4 files changed, 16 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/66f8f2ae/wicket-examples/pom.xml
----------------------------------------------------------------------
[4/5] wicket git commit: [WICKET-6476] check is added while setting
filter path to prevent exception
Posted by so...@apache.org.
[WICKET-6476] check is added while setting filter path to prevent exception
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/58a7106d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/58a7106d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/58a7106d
Branch: refs/heads/WICKET-6105-java.time
Commit: 58a7106d74de02cc9f193d95613b6c1f3483ca7b
Parents: 05aa3e8
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Tue Oct 3 11:46:28 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Tue Oct 3 11:46:28 2017 +0700
----------------------------------------------------------------------
.../wicket/protocol/ws/util/tester/WebSocketTester.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/58a7106d/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTester.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTester.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTester.java
index 69aa114..f45c826 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTester.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTester.java
@@ -51,7 +51,10 @@ public class WebSocketTester
Args.notNull(page, "page");
WebApplication webApplication = wicketTester.getApplication();
- webApplication.getWicketFilter().setFilterPath("");
+ if (webApplication.getWicketFilter().getFilterPath() == null)
+ {
+ webApplication.getWicketFilter().setFilterPath("");
+ }
socketProcessor = new TestWebSocketProcessor(wicketTester, page)
{
@@ -85,7 +88,10 @@ public class WebSocketTester
Args.notNull(resourceName, "resourceName");
WebApplication webApplication = wicketTester.getApplication();
- webApplication.getWicketFilter().setFilterPath("");
+ if (webApplication.getWicketFilter().getFilterPath() == null)
+ {
+ webApplication.getWicketFilter().setFilterPath("");
+ }
socketProcessor = new TestWebSocketProcessor(wicketTester, resourceName)
{
[2/5] wicket git commit: WICKET-6074 Use SHA 256+ for signing the
release artefacts
Posted by so...@apache.org.
WICKET-6074 Use SHA 256+ for signing the release artefacts
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/49df0e59
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/49df0e59
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/49df0e59
Branch: refs/heads/WICKET-6105-java.time
Commit: 49df0e591db940ba86ccdd0830df0a814da9b6cc
Parents: 35a7d6d
Author: Andrea Del Bene <ad...@apache.org>
Authored: Thu Sep 28 15:04:43 2017 +0200
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Thu Sep 28 15:04:43 2017 +0200
----------------------------------------------------------------------
release.sh | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/49df0e59/release.sh
----------------------------------------------------------------------
diff --git a/release.sh b/release.sh
index 2eb352a..b344d29 100755
--- a/release.sh
+++ b/release.sh
@@ -530,10 +530,8 @@ git archive --format=tar.gz --prefix=apache-wicket-$version/ -o target/dist/apac
git archive --format=zip --prefix=apache-wicket-$version/ -o target/dist/apache-wicket-$version.zip $tag
gpg --armor --detach-sign --use-agent --sign target/dist/apache-wicket-$version.tar.gz
gpg --armor --detach-sign --use-agent --sign target/dist/apache-wicket-$version.zip
-gpg --print-md SHA1 target/dist/apache-wicket-$version.tar.gz > target/dist/apache-wicket-$version.tar.gz.sha
-gpg --print-md MD5 target/dist/apache-wicket-$version.tar.gz > target/dist/apache-wicket-$version.tar.gz.md5
-gpg --print-md SHA1 target/dist/apache-wicket-$version.zip > target/dist/apache-wicket-$version.zip.sha
-gpg --print-md MD5 target/dist/apache-wicket-$version.zip > target/dist/apache-wicket-$version.zip.md5
+sha256sum target/dist/apache-wicket-$version.tar.gz > target/dist/apache-wicket-$version.tar.gz.sha256
+sha256sum target/dist/apache-wicket-$version.zip > target/dist/apache-wicket-$version.zip.sha256
echo "Create and sign the binaries"
mkdir target/apache-wicket-$version-bin
@@ -552,10 +550,8 @@ tar cfz dist/binaries/apache-wicket-$version-bin.tar.gz apache-wicket-$version-b
zip -r dist/binaries/apache-wicket-$version-bin.zip apache-wicket-$version-bin
gpg --armor --detach-sign --use-agent --sign dist/binaries/apache-wicket-$version-bin.tar.gz
gpg --armor --detach-sign --use-agent --sign dist/binaries/apache-wicket-$version-bin.zip
-gpg --print-md SHA1 dist/binaries/apache-wicket-$version-bin.tar.gz > dist/binaries/apache-wicket-$version-bin.tar.gz.sha
-gpg --print-md MD5 dist/binaries/apache-wicket-$version-bin.tar.gz > dist/binaries/apache-wicket-$version-bin.tar.gz.md5
-gpg --print-md SHA1 dist/binaries/apache-wicket-$version-bin.zip > dist/binaries/apache-wicket-$version-bin.zip.sha
-gpg --print-md MD5 dist/binaries/apache-wicket-$version-bin.zip > dist/binaries/apache-wicket-$version-bin.zip.md5
+sha256sum dist/binaries/apache-wicket-$version-bin.tar.gz > dist/binaries/apache-wicket-$version-bin.tar.gz.sha256
+sha256sum dist/binaries/apache-wicket-$version-bin.zip > dist/binaries/apache-wicket-$version-bin.zip.sha256
popd
echo "Uploading release to dist.apache.org"