You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bd...@apache.org on 2020/10/17 15:00:27 UTC

[shiro] branch master updated (c632a62 -> 1ad362a)

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

bdemers pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shiro.git.


    from c632a62  Merge pull request #257 from FredTreg/patch-1
     add b68739b  Update AbstractContainerIT to allow for HTTPS connections
     new 1ad362a  Merge pull request #260 from apache/tls-for-its

The 1 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:
 .../shiro/testing/web/AbstractContainerIT.java     |  69 +++++++++++++++++++++
 .../support/src/main/resources/createKeyStore.sh   |  65 +++++++++++++++++++
 .../support/src/main/resources/test-keystore.jks   | Bin 0 -> 2272 bytes
 .../support/src/main/resources/test-keystore.pem   |  22 +++++++
 pom.xml                                            |   2 +
 ...onIT.java => WebAppContainerIntegrationIT.java} |   6 +-
 6 files changed, 161 insertions(+), 3 deletions(-)
 create mode 100755 integration-tests/support/src/main/resources/createKeyStore.sh
 create mode 100644 integration-tests/support/src/main/resources/test-keystore.jks
 create mode 100644 integration-tests/support/src/main/resources/test-keystore.pem
 rename samples/web/src/test/java/org/apache/shiro/test/{ContainerIntegrationIT.java => WebAppContainerIntegrationIT.java} (91%)


[shiro] 01/01: Merge pull request #260 from apache/tls-for-its

Posted by bd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bdemers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shiro.git

commit 1ad362ad7193b41d097c11eff8b07683a161ba94
Merge: c632a62 b68739b
Author: Brian Demers <bd...@apache.org>
AuthorDate: Sat Oct 17 11:00:17 2020 -0400

    Merge pull request #260 from apache/tls-for-its
    
    Update AbstractContainerIT to allow for HTTPS connections Using a pre-generated keystore (master)

 .../shiro/testing/web/AbstractContainerIT.java     |  69 +++++++++++++++++++++
 .../support/src/main/resources/createKeyStore.sh   |  65 +++++++++++++++++++
 .../support/src/main/resources/test-keystore.jks   | Bin 0 -> 2272 bytes
 .../support/src/main/resources/test-keystore.pem   |  22 +++++++
 pom.xml                                            |   2 +
 ...onIT.java => WebAppContainerIntegrationIT.java} |   6 +-
 6 files changed, 161 insertions(+), 3 deletions(-)