This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


    from dcf5f02ed9 [maven-release-plugin] prepare for next development 
iteration
     new b7a5571fdb Removing ws-security keys from samples, using testutils 
instead
     new a5a3a74a34 Recording .gitmergeinfo Changes

The 2 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:
 .gitmergeinfo                                       |   2 ++
 .../release/samples/ws_security/sign_enc/pom.xml    |   6 ++++++
 .../main/resources/etc/Client_Encrypt.properties    |   2 +-
 .../src/main/resources/etc/Client_Sign.properties   |   2 +-
 .../main/resources/etc/Server_Decrypt.properties    |   2 +-
 .../main/resources/etc/Server_SignVerf.properties   |   2 +-
 .../sign_enc/src/main/resources/keystore/Bethal.jks | Bin 2202 -> 0 bytes
 .../sign_enc/src/main/resources/keystore/Morpit.jks | Bin 2221 -> 0 bytes
 .../src/main/resources/keystore/Truststore.jks      | Bin 4447 -> 0 bytes
 .../samples/ws_security/sign_enc_policy/pom.xml     |   6 ++++++
 .../main/resources/etc/Client_Encrypt.properties    |   2 +-
 .../main/resources/etc/Server_Decrypt.properties    |   2 +-
 .../src/main/resources/keystore/Morpit.jks          | Bin 2221 -> 0 bytes
 .../src/main/resources/keystore/Truststore.jks      | Bin 4447 -> 0 bytes
 .../release/samples/ws_security/ut_policy/pom.xml   |   6 ++++++
 .../ut_policy/src/main/config/KeyREADME.txt         |  20 --------------------
 .../ut_policy/src/main/config/clientKeystore.jks    | Bin 4559 -> 0 bytes
 .../ut_policy/src/main/config/serviceKeystore.jks   | Bin 3475 -> 0 bytes
 .../ut_policy/src/main/config/stsstore.jks          | Bin 4557 -> 0 bytes
 .../ut_policy/src/main/resources/ClientConfig.xml   |   8 ++++----
 .../src/main/resources/ClientConfigStax.xml         |   8 ++++----
 .../ut_policy/src/main/resources/ServiceConfig.xml  |   8 ++++----
 .../src/main/resources/ServiceConfigStax.xml        |   8 ++++----
 23 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 
distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/keystore/Bethal.jks
 delete mode 100644 
distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/keystore/Morpit.jks
 delete mode 100644 
distribution/src/main/release/samples/ws_security/sign_enc/src/main/resources/keystore/Truststore.jks
 delete mode 100644 
distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/keystore/Morpit.jks
 delete mode 100644 
distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/keystore/Truststore.jks
 delete mode 100644 
distribution/src/main/release/samples/ws_security/ut_policy/src/main/config/KeyREADME.txt
 delete mode 100644 
distribution/src/main/release/samples/ws_security/ut_policy/src/main/config/clientKeystore.jks
 delete mode 100644 
distribution/src/main/release/samples/ws_security/ut_policy/src/main/config/serviceKeystore.jks
 delete mode 100644 
distribution/src/main/release/samples/ws_security/ut_policy/src/main/config/stsstore.jks

Reply via email to