You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/10/19 08:56:07 UTC
[cxf-fediz] branch master updated: Updating Jetty to 9.4.32 +
fixing tests
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
The following commit(s) were added to refs/heads/master by this push:
new f360b65 Updating Jetty to 9.4.32 + fixing tests
f360b65 is described below
commit f360b65712963fab1faa7354f8c885bdf668c86d
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Oct 19 09:53:12 2020 +0100
Updating Jetty to 9.4.32 + fixing tests
---
pom.xml | 2 +-
services/idp/pom.xml | 9 +++++++++
services/idp/src/test/resources/idp-ssl-key.jks | Bin 0 -> 2072 bytes
services/idp/src/test/resources/jetty-ssl-context.xml | 4 ++--
services/sts/src/test/resources/jetty-ssl-context.xml | 4 ++--
5 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 185c460..eeb51b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
<htmlunit.version>2.43.0</htmlunit.version>
<jackson.version>2.10.5</jackson.version>
<jaxb.version>2.3.2</jaxb.version>
- <jetty9.version>9.4.30.v20200611</jetty9.version>
+ <jetty9.version>9.4.32.v20200930</jetty9.version>
<junit.version>4.13.1</junit.version>
<kerby.version>2.0.1</kerby.version>
<log4j.version>1.2.17</log4j.version>
diff --git a/services/idp/pom.xml b/services/idp/pom.xml
index 2561b82..ff7ee26 100644
--- a/services/idp/pom.xml
+++ b/services/idp/pom.xml
@@ -92,8 +92,17 @@
<includes>
<include>**/*</include>
</includes>
+ <excludes>
+ <exclude>**/*.jks</exclude>
+ </excludes>
<filtering>true</filtering>
</testResource>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*.jks</include>
+ </includes>
+ </testResource>
</testResources>
<plugins>
<plugin>
diff --git a/services/idp/src/test/resources/idp-ssl-key.jks b/services/idp/src/test/resources/idp-ssl-key.jks
new file mode 100644
index 0000000..50c23a1
Binary files /dev/null and b/services/idp/src/test/resources/idp-ssl-key.jks differ
diff --git a/services/idp/src/test/resources/jetty-ssl-context.xml b/services/idp/src/test/resources/jetty-ssl-context.xml
index cfb22d2..277e873 100644
--- a/services/idp/src/test/resources/jetty-ssl-context.xml
+++ b/services/idp/src/test/resources/jetty-ssl-context.xml
@@ -25,12 +25,12 @@
<!-- SSL ContextFactory configuration -->
<!-- ============================================================= -->
<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
- <Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.keyStorePath" deprecated="jetty.keystore" default="${basedir}/../../examples/samplekeys/idp-ssl-key.jks"/></Set>
+ <Set name="KeyStorePath"><Property name="jetty.base" default="${project.build.directory}" />/<Property name="jetty.sslContext.keyStorePath" deprecated="jetty.keystore" default="/test-classes/idp-ssl-key.jks"/></Set>
<Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" deprecated="jetty.keystore.password" default="tompass"/></Set>
<Set name="KeyStoreType"><Property name="jetty.sslContext.keyStoreType" default="JKS"/></Set>
<Set name="KeyStoreProvider"><Property name="jetty.sslContext.keyStoreProvider"/></Set>
<Set name="KeyManagerPassword"><Property name="jetty.sslContext.keyManagerPassword" deprecated="jetty.keymanager.password" default="tompass"/></Set>
- <Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.trustStorePath" deprecated="jetty.truststore" default="${basedir}/../../examples/samplekeys/idp-ssl-key.jks"/></Set>
+ <Set name="TrustStorePath"><Property name="jetty.base" default="${project.build.directory}" />/<Property name="jetty.sslContext.trustStorePath" deprecated="jetty.truststore" default="/test-classes/idp-ssl-key.jks"/></Set>
<Set name="TrustStorePassword"><Property name="jetty.sslContext.trustStorePassword" deprecated="jetty.truststore.password" default="tompass"/></Set>
<Set name="TrustStoreType"><Property name="jetty.sslContext.trustStoreType"/></Set>
<Set name="TrustStoreProvider"><Property name="jetty.sslContext.trustStoreProvider"/></Set>
diff --git a/services/sts/src/test/resources/jetty-ssl-context.xml b/services/sts/src/test/resources/jetty-ssl-context.xml
index 382ea48..bc3dfe0 100644
--- a/services/sts/src/test/resources/jetty-ssl-context.xml
+++ b/services/sts/src/test/resources/jetty-ssl-context.xml
@@ -25,12 +25,12 @@
<!-- SSL ContextFactory configuration -->
<!-- ============================================================= -->
<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
- <Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.keyStorePath" deprecated="jetty.keystore" default="${project.build.directory}/test-classes/jetty-ssl.keystore"/></Set>
+ <Set name="KeyStorePath"><Property name="jetty.base" default="${project.build.directory}" />/<Property name="jetty.sslContext.keyStorePath" deprecated="jetty.keystore" default="/test-classes/jetty-ssl.keystore"/></Set>
<Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" deprecated="jetty.keystore.password" default="jettypw"/></Set>
<Set name="KeyStoreType"><Property name="jetty.sslContext.keyStoreType" default="JKS"/></Set>
<Set name="KeyStoreProvider"><Property name="jetty.sslContext.keyStoreProvider"/></Set>
<Set name="KeyManagerPassword"><Property name="jetty.sslContext.keyManagerPassword" deprecated="jetty.keymanager.password" default="jettypw"/></Set>
- <Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.trustStorePath" deprecated="jetty.truststore" default="${project.build.directory}/test-classes/jetty-ssl.keystore"/></Set>
+ <Set name="TrustStorePath"><Property name="jetty.base" default="${project.build.directory}" />/<Property name="jetty.sslContext.trustStorePath" deprecated="jetty.truststore" default="/test-classes/jetty-ssl.keystore"/></Set>
<Set name="TrustStorePassword"><Property name="jetty.sslContext.trustStorePassword" deprecated="jetty.truststore.password" default="jettypw"/></Set>
<Set name="TrustStoreType"><Property name="jetty.sslContext.trustStoreType"/></Set>
<Set name="TrustStoreProvider"><Property name="jetty.sslContext.trustStoreProvider"/></Set>