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 2021/11/25 10:14:00 UTC
[wicket] branch master updated (920aa6c -> 3ea6ff9)
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git.
from 920aa6c WICKET-6937 maven-resources-plugin should not filter the keystore file
new e10bc82 WICKET-6937 Few more updates of keystore file name
new 15e4c01 WICKET-6937 Fix a comment
new 3ea6ff9 WICKET-6937 Use JKS keystore
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../archetype-resources/src/test/java/Start.java | 2 +-
.../archetype-resources/src/test/jetty/jetty-ssl.xml | 2 +-
.../archetype-resources/src/test/resources/keystore | Bin 0 -> 3954 bytes
.../archetype-resources/src/test/resources/keystore.p12 | Bin 4439 -> 0 bytes
4 files changed, 2 insertions(+), 2 deletions(-)
create mode 100644 archetypes/quickstart/src/main/resources/archetype-resources/src/test/resources/keystore
delete mode 100644 archetypes/quickstart/src/main/resources/archetype-resources/src/test/resources/keystore.p12
[wicket] 01/03: WICKET-6937 Few more updates of keystore file name
Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit e10bc82d00659b54192e3080b0f2e77d7c0dfa85
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Thu Nov 25 11:24:34 2021 +0200
WICKET-6937 Few more updates of keystore file name
---
archetypes/quickstart/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml
index 2e324d1..a3e65d9 100644
--- a/archetypes/quickstart/pom.xml
+++ b/archetypes/quickstart/pom.xml
@@ -37,14 +37,14 @@
<filtering>true</filtering>
<directory>${project.basedir}/src/main/resources</directory>
<excludes>
- <exclude>**/keystore</exclude>
+ <exclude>**/keystore.p12</exclude>
</excludes>
</resource>
<resource>
<filtering>false</filtering>
<directory>${project.basedir}/src/main/resources</directory>
<includes>
- <include>**/keystore</include>
+ <include>**/keystore.p12</include>
</includes>
</resource>
</resources>
[wicket] 03/03: WICKET-6937 Use JKS keystore
Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 3ea6ff9c7fcff5fdb9a349dff631386d0314ca2b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Thu Nov 25 12:11:58 2021 +0200
WICKET-6937 Use JKS keystore
The PKCS12 one either has problems with Maven filtering or Jetty does not like it ...
The new keystore has been generated with the following command:
keytool -genkeypair -alias jetty -keyalg RSA -keysize 4096 -sigalg SHA256withRSA -keypass wicket -startdate "2021/11/25 00:00:00" -validity 3650 -storetype JKS -storepass wicket -keystore keystore
(cherry picked from commit 2b54fd59083b1b91071ad6a5820e2f74da24c6c0)
---
archetypes/quickstart/pom.xml | 4 ++--
.../archetype-resources/src/test/jetty/jetty-ssl.xml | 2 +-
.../archetype-resources/src/test/resources/keystore | Bin 0 -> 3954 bytes
.../archetype-resources/src/test/resources/keystore.p12 | Bin 4439 -> 0 bytes
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml
index a3e65d9..2e324d1 100644
--- a/archetypes/quickstart/pom.xml
+++ b/archetypes/quickstart/pom.xml
@@ -37,14 +37,14 @@
<filtering>true</filtering>
<directory>${project.basedir}/src/main/resources</directory>
<excludes>
- <exclude>**/keystore.p12</exclude>
+ <exclude>**/keystore</exclude>
</excludes>
</resource>
<resource>
<filtering>false</filtering>
<directory>${project.basedir}/src/main/resources</directory>
<includes>
- <include>**/keystore.p12</include>
+ <include>**/keystore</include>
</includes>
</resource>
</resources>
diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/src/test/jetty/jetty-ssl.xml b/archetypes/quickstart/src/main/resources/archetype-resources/src/test/jetty/jetty-ssl.xml
index f411ae7..f23231b 100644
--- a/archetypes/quickstart/src/main/resources/archetype-resources/src/test/jetty/jetty-ssl.xml
+++ b/archetypes/quickstart/src/main/resources/archetype-resources/src/test/jetty/jetty-ssl.xml
@@ -6,7 +6,7 @@
<!-- and either jetty-https.xml or jetty-spdy.xml (but not both) -->
<!-- ============================================================= -->
<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
- <Set name="KeyStorePath"><Property name="maven.project.build.directory.test-classes" default="." />/<Property name="jetty.keystore" default="keystore.p12"/></Set>
+ <Set name="KeyStorePath"><Property name="maven.project.build.directory.test-classes" default="." />/<Property name="jetty.keystore" default="keystore"/></Set>
<Set name="KeyStorePassword"><Property name="jetty.keystore.password" default="wicket"/></Set>
<Set name="KeyManagerPassword"><Property name="jetty.keymanager.password" default="wicket"/></Set>
<Set name="EndpointIdentificationAlgorithm"></Set>
diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/src/test/resources/keystore b/archetypes/quickstart/src/main/resources/archetype-resources/src/test/resources/keystore
new file mode 100644
index 0000000..1473db3
Binary files /dev/null and b/archetypes/quickstart/src/main/resources/archetype-resources/src/test/resources/keystore differ
diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/src/test/resources/keystore.p12 b/archetypes/quickstart/src/main/resources/archetype-resources/src/test/resources/keystore.p12
deleted file mode 100644
index 5dfa868..0000000
Binary files a/archetypes/quickstart/src/main/resources/archetype-resources/src/test/resources/keystore.p12 and /dev/null differ
[wicket] 02/03: WICKET-6937 Fix a comment
Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 15e4c015dd84c428ec8ec192ae922d475ed71a2d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Thu Nov 25 12:13:26 2021 +0200
WICKET-6937 Fix a comment
---
.../src/main/resources/archetype-resources/src/test/java/Start.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/Start.java b/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/Start.java
index d806ee1..37d546a 100644
--- a/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/Start.java
+++ b/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/Start.java
@@ -49,7 +49,7 @@ public class Start
// if a keystore for a SSL certificate is available, start a SSL
// connector on port 8443.
// By default, the quickstart comes with a Apache Wicket Quickstart
- // Certificate that expires about half way september 2021. Do not
+ // Certificate that expires about half way september 2031. Do not
// use this certificate anywhere important as the passwords are
// available in the source.