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 2021/05/07 15:54:24 UTC

[shiro] branch main updated (9e68eb4 -> 4cebebb)

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

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


    from 9e68eb4  Merge pull request #295 from fpapon/INFRA-21748
     add bb4da53  Minor build related changes
     add bc7fa33  Add doc note in AesCipherService of Java 14 behavior change
     add 2588375  Rename var in jenkinsfile deployableBranch is a better name chan supportedBranch
     new 4cebebb  Merge pull request #298 from apache/pr-297-to-main

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:
 .jenkins.groovy                                                | 10 ++++++----
 .../java/org/apache/shiro/crypto/cipher/AesCipherService.java  |  3 +++
 pom.xml                                                        |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

[shiro] 01/01: Merge pull request #298 from apache/pr-297-to-main

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

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

commit 4cebebbd7892ab160c2b6f0ca0b27a1e8c1548d2
Merge: 9e68eb4 2588375
Author: Brian Demers <bd...@apache.org>
AuthorDate: Fri May 7 11:54:18 2021 -0400

    Merge pull request #298 from apache/pr-297-to-main
    
    Pr 297 to main

 .jenkins.groovy                                                | 10 ++++++----
 .../java/org/apache/shiro/crypto/cipher/AesCipherService.java  |  3 +++
 pom.xml                                                        |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)