This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 3ac836a TOMEE-2586 Fix examples/webservices-ws-security to work on
Java 11
new 9a00e76 Merge pull request #530 from davidsalter/TOMEE-2586
3ac836a is described below
commit 3ac836a779cd67b5455dcf0789e122f1bf5aa7dd
Author: David Salter <[email protected]>
AuthorDate: Mon Aug 5 14:41:17 2019 +0100
TOMEE-2586 Fix examples/webservices-ws-security to work on Java 11
Changed the keystore to be in JKS format so it works with both Java 8
and Java 11.
---
examples/webservice-ws-security/create-keystores.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/examples/webservice-ws-security/create-keystores.xml
b/examples/webservice-ws-security/create-keystores.xml
index 5f2c056..7faa30d 100644
--- a/examples/webservice-ws-security/create-keystores.xml
+++ b/examples/webservice-ws-security/create-keystores.xml
@@ -46,6 +46,7 @@
<property name="client.file"
value="${basedir}/target/test-classes/META-INF/clientKey.rsa"/>
<property name="keyalg" value="RSA"/>
+ <property name="storetype" value="jks"/>
<!-- now create our JDK specific targets -->
<target name="do.ibm.jdk" if="is.ibm.jdk">
@@ -131,6 +132,7 @@
<arg line="-storepass ${server.storepass}"/>
<arg line="-dname ${server.dname}"/>
<arg line="-keyalg ${keyalg}"/>
+ <arg line="-storetype ${storetype}"/>
</java>
<java classname="${is.sun.jdk}" fork="true">
<arg line="-selfcert"/>
@@ -157,6 +159,7 @@
<arg line="-storepass ${client.storepass}"/>
<arg line="-dname ${client.dname}"/>
<arg line="-keyalg ${keyalg}"/>
+ <arg line="-storetype ${storetype}"/>
</java>
<java classname="${is.sun.jdk}" fork="true">
<arg line="-selfcert"/>
