You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bm...@apache.org on 2021/06/25 06:25:04 UTC
[shiro] branch jdk16-builds-jenkins updated (1195385 -> 1b15b32)
This is an automated email from the ASF dual-hosted git repository.
bmarwell pushed a change to branch jdk16-builds-jenkins
in repository https://gitbox.apache.org/repos/asf/shiro.git.
discard 1195385 (build) update latest GA'd JDKs to 16.
add de50cfb Fix typo in Guice quickstart
add 5354e1a Merge pull request #294 from apache/quickstart-typo
add c57fed9 add Spring internal proxy creator condition
add 0208130 Merge pull request #268 from seaswalker/avoid_conflict_with_spring
add c6e6ca7 [SHIRO-290] Implement BCrypt and Argon2
add d84faf8 [SHIRO-290] doc fix, remove backwards compatibility for SimpleHash.
add 29dcaad [SHIRO-290] add review suggestions:
add eb8662d [SHIRO-290] remove obsolete legacy-tests.
add 2e9cddc Merge pull request #280 from apache/SHIRO-290
add 3eb2642 [SHIRO-819] Migrato to spring-boot-maven-plugin
add cfea5a8 Merge pull request #304 from bmarwell/SHIRO-819_hasher-util
add 132720e [SHIRO-818] Return other status codes for AuthorizationExceptions.
add a949178 Merge pull request #303 from bmarwell/fix-jaxrs-exceptionmapper
add 215ba01 [SHIRO-823] remove broken jaxrs sample project.
add e2df3fa Merge pull request #305 from bmarwell/SHIRO-823_remove-jaxrs-sample
add ba4c318 [SHIRO-822] Update aspectj-maven-plugin.
add 671f40f Merge pull request #306 from bmarwell/aspectj-maven-plugin
add ac00970 Combine Spring Boot starters (web and non-web) into single module
add 5682cf6 Merge pull request #293 from apache/single-spring-boot
add de3df86 Update `CommonsInterpolator` doc to reflect actual behavior
add 21d7562 Update config/ogdl/src/main/java/org/apache/shiro/config/ogdl/CommonsInterpolator.java
add 1c97815 Merge pull request #302 from weltonrodrigo/patch-1
add a5da6e8 update setup-jdk / maven action.
add fd4ca86 Bump AspectJ to 1.9.7.M3, centralise AspectJ Maven config
add 69132cd Merge pull request #301 from bmarwell/update-setup-jdk
add 1b15b32 (build) update latest GA'd JDKs to 16.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (1195385)
\
N -- N -- N refs/heads/jdk16-builds-jenkins (1b15b32)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.github/workflows/maven.yml | 83 ++++-
RELEASE-NOTES | 20 +-
.../shiro/config/ogdl/CommonsInterpolator.java | 4 +-
core/pom.xml | 10 +
.../shiro/authc/SimpleAuthenticationInfo.java | 26 +-
.../authc/credential/DefaultPasswordService.java | 58 ++--
.../authc/credential/HashedCredentialsMatcher.java | 32 +-
.../authc/credential/Md2CredentialsMatcher.java | 47 ---
.../authc/credential/Md5CredentialsMatcher.java | 46 ---
.../shiro/authc/credential/PasswordMatcher.java | 18 +-
.../authc/credential/Sha1CredentialsMatcher.java | 46 ---
.../shiro/realm/text/TextConfigurationRealm.java | 1 +
.../credential/DefaultPasswordServiceTest.groovy | 110 ++----
.../authc/credential/PasswordMatcherTest.groovy | 49 ++-
.../credential/HashedCredentialsMatcherTest.java | 24 +-
.../credential/Md2CredentialsMatcherTest.java | 39 ---
.../credential/Md5CredentialsMatcherTest.java | 37 --
.../credential/Sha1CredentialsMatcherTest.java | 37 --
crypto/cipher/pom.xml | 1 -
crypto/hash/pom.xml | 5 +
.../shiro/crypto/hash/AbstractCryptHash.java | 253 ++++++++++++++
.../org/apache/shiro/crypto/hash/AbstractHash.java | 74 +---
.../shiro/crypto/hash/ConfigurableHashService.java | 34 +-
.../shiro/crypto/hash/DefaultHashService.java | 281 ++--------------
.../java/org/apache/shiro/crypto/hash/Hash.java | 12 +-
.../org/apache/shiro/crypto/hash/HashProvider.java | 62 ++++
.../org/apache/shiro/crypto/hash/HashRequest.java | 75 +++--
.../java/org/apache/shiro/crypto/hash/HashSpi.java | 87 +++++
.../java/org/apache/shiro/crypto/hash/Md2Hash.java | 65 ----
.../java/org/apache/shiro/crypto/hash/Md5Hash.java | 66 ----
.../org/apache/shiro/crypto/hash/Sha1Hash.java | 67 ----
.../org/apache/shiro/crypto/hash/SimpleHash.java | 85 ++++-
.../shiro/crypto/hash/SimpleHashProvider.java | 219 ++++++++++++
.../shiro/crypto/hash/SimpleHashRequest.java | 51 +--
.../shiro/crypto/hash/format/Base64Format.java | 14 +-
.../hash/format/DefaultHashFormatFactory.java | 5 +-
.../shiro/crypto/hash/format/HashFormat.java | 5 +-
.../apache/shiro/crypto/hash/format/HexFormat.java | 12 +-
.../crypto/hash/format/ProvidedHashFormat.java | 13 +-
.../crypto/hash/format/Shiro1CryptFormat.java | 18 +-
.../crypto/hash/format/Shiro2CryptFormat.java | 137 ++++++++
crypto/hash/src/main/resources/META-INF/NOTICE | 2 +-
.../services/org.apache.shiro.crypto.hash.HashSpi | 1 +
.../crypto/hash/DefaultHashServiceTest.groovy | 82 +----
.../crypto/hash/HashRequestBuilderTest.groovy | 31 +-
.../crypto/hash/format/Base64FormatTest.groovy | 10 +-
.../format/DefaultHashFormatFactoryTest.groovy | 7 +-
.../shiro/crypto/hash/format/HexFormatTest.groovy | 12 +-
.../hash/format/ProvidedHashFormatTest.groovy | 3 +-
.../hash/format/Shiro1CryptFormatTest.groovy | 7 +-
crypto/pom.xml | 1 +
.../support/hashes/argon2}/pom.xml | 56 ++--
.../crypto/support/hashes/argon2/Argon2Hash.java | 371 +++++++++++++++++++++
.../support/hashes/argon2/Argon2HashProvider.java | 207 ++++++++++++
.../argon2}/src/main/resources/META-INF/NOTICE | 9 +-
.../services/org.apache.shiro.crypto.hash.HashSpi | 7 +-
.../support/hashes/argon2/Argon2HashTest.groovy | 92 +++++
.../support/hashes/bcrypt}/pom.xml | 56 ++--
.../crypto/support/hashes/bcrypt/BCryptHash.java | 200 +++++++++++
.../support/hashes/bcrypt/BCryptProvider.java | 144 ++++++++
.../support/hashes/bcrypt/OpenBSDBase64.java | 179 ++++++++++
.../bcrypt}/src/main/resources/META-INF/NOTICE | 9 +-
.../services/org.apache.shiro.crypto.hash.HashSpi | 7 +-
.../support/hashes/bcrypt/BCryptHashTest.groovy | 98 ++++++
{config => crypto/support}/pom.xml | 17 +-
.../org/apache/shiro/lang/codec/CodecSupport.java | 40 ++-
.../apache/shiro/lang/util/SimpleByteSource.java | 13 +-
.../org/apache/shiro/lang/util/StringUtils.java | 12 +
pom.xml | 44 ++-
samples/aspectj/pom.xml | 2 +-
samples/jaxrs/pom.xml | 221 ------------
.../shiro/samples/jaxrs/SampleApplication.java | 50 ---
.../samples/jaxrs/resources/HelloResource.java | 47 ---
.../samples/jaxrs/resources/SecureResource.java | 75 -----
samples/jaxrs/src/main/resources/META-INF/NOTICE | 15 -
samples/jaxrs/src/main/resources/shiro.ini | 43 ---
samples/jaxrs/src/main/webapp/WEB-INF/web.cxf.xml | 41 ---
.../shiro/web/jaxrs/ContainerIntegrationIT.groovy | 143 --------
samples/pom.xml | 1 -
.../src/main/java/QuickstartGuice.java | 2 +-
support/aspectj/pom.xml | 18 +-
support/jaxrs/pom.xml | 36 ++
.../org/apache/shiro/web/jaxrs/ShiroFeature.java | 7 +-
...> UnauthenticatedExceptionExceptionMapper.java} | 27 +-
...a => UnauthorizedExceptionExceptionMapper.java} | 24 +-
.../shiro/web/jaxrs/ExceptionMapperTest.groovy | 64 ----
...UnauthorizedExceptionExceptionMapperTest.groovy | 49 +++
support/spring-boot/spring-boot-starter/pom.xml | 10 +
.../ShiroAnnotationProcessorAutoConfiguration.java | 5 +-
.../autoconfigure/ShiroWebAutoConfiguration.java | 2 +
.../autoconfigure/ShiroWebFilterConfiguration.java | 2 +
.../ShiroWebMvcAutoConfiguration.java | 2 +
.../additional-spring-configuration-metadata.json | 36 ++
.../src/main/resources/META-INF/spring.factories | 3 +
.../src/main/resources/META-INF/spring.provides | 2 +-
.../web/ConfiguredGlobalFiltersTest.groovy | 0
.../web/DisabledGlobalFiltersTest.groovy | 0
.../web/ShiroWebSpringAutoConfigurationTest.groovy | 0
.../ShiroWebAutoConfigurationTestApplication.java | 0
.../spring-boot/spring-boot-web-starter/pom.xml | 19 --
.../src/main/resources/META-INF/NOTICE | 15 -
.../additional-spring-configuration-metadata.json | 46 ---
.../src/main/resources/META-INF/spring.factories | 4 -
.../src/main/resources/META-INF/spring.provides | 1 -
.../web/WebSpringFactoriesTest.groovy | 42 ---
tools/hasher/pom.xml | 42 ++-
tools/hasher/src/main/assembly/cli.assembly.xml | 35 --
.../java/org/apache/shiro/tools/hasher/Hasher.java | 70 ++--
.../hasher}/src/main/resources/logback.xml | 13 +-
.../org/apache/shiro/tools/hasher/HasherTest.java | 101 ++++++
.../hasher/src/test/resources/logback-test.xml | 16 +-
111 files changed, 3119 insertions(+), 2257 deletions(-)
delete mode 100644 core/src/main/java/org/apache/shiro/authc/credential/Md2CredentialsMatcher.java
delete mode 100644 core/src/main/java/org/apache/shiro/authc/credential/Md5CredentialsMatcher.java
delete mode 100644 core/src/main/java/org/apache/shiro/authc/credential/Sha1CredentialsMatcher.java
delete mode 100644 core/src/test/java/org/apache/shiro/authc/credential/Md2CredentialsMatcherTest.java
delete mode 100644 core/src/test/java/org/apache/shiro/authc/credential/Md5CredentialsMatcherTest.java
delete mode 100644 core/src/test/java/org/apache/shiro/authc/credential/Sha1CredentialsMatcherTest.java
create mode 100644 crypto/hash/src/main/java/org/apache/shiro/crypto/hash/AbstractCryptHash.java
create mode 100644 crypto/hash/src/main/java/org/apache/shiro/crypto/hash/HashProvider.java
create mode 100644 crypto/hash/src/main/java/org/apache/shiro/crypto/hash/HashSpi.java
delete mode 100644 crypto/hash/src/main/java/org/apache/shiro/crypto/hash/Md2Hash.java
delete mode 100644 crypto/hash/src/main/java/org/apache/shiro/crypto/hash/Md5Hash.java
delete mode 100644 crypto/hash/src/main/java/org/apache/shiro/crypto/hash/Sha1Hash.java
create mode 100644 crypto/hash/src/main/java/org/apache/shiro/crypto/hash/SimpleHashProvider.java
create mode 100644 crypto/hash/src/main/java/org/apache/shiro/crypto/hash/format/Shiro2CryptFormat.java
copy samples/spring/src/main/resources/application.properties => crypto/hash/src/main/resources/META-INF/services/org.apache.shiro.crypto.hash.HashSpi (94%)
copy {support/quartz => crypto/support/hashes/argon2}/pom.xml (56%)
create mode 100644 crypto/support/hashes/argon2/src/main/java/org/apache/shiro/crypto/support/hashes/argon2/Argon2Hash.java
create mode 100644 crypto/support/hashes/argon2/src/main/java/org/apache/shiro/crypto/support/hashes/argon2/Argon2HashProvider.java
copy {config/ogdl => crypto/support/hashes/argon2}/src/main/resources/META-INF/NOTICE (78%)
copy core/src/test/resources/org/apache/shiro/realm/text/IniRealmTest.simple.ini => crypto/support/hashes/argon2/src/main/resources/META-INF/services/org.apache.shiro.crypto.hash.HashSpi (92%)
create mode 100644 crypto/support/hashes/argon2/src/test/groovy/org/apache/shiro/crypto/support/hashes/argon2/Argon2HashTest.groovy
copy {support/quartz => crypto/support/hashes/bcrypt}/pom.xml (56%)
create mode 100644 crypto/support/hashes/bcrypt/src/main/java/org/apache/shiro/crypto/support/hashes/bcrypt/BCryptHash.java
create mode 100644 crypto/support/hashes/bcrypt/src/main/java/org/apache/shiro/crypto/support/hashes/bcrypt/BCryptProvider.java
create mode 100644 crypto/support/hashes/bcrypt/src/main/java/org/apache/shiro/crypto/support/hashes/bcrypt/OpenBSDBase64.java
copy {config/ogdl => crypto/support/hashes/bcrypt}/src/main/resources/META-INF/NOTICE (78%)
copy core/src/test/resources/org/apache/shiro/realm/text/IniRealmTest.simple.ini => crypto/support/hashes/bcrypt/src/main/resources/META-INF/services/org.apache.shiro.crypto.hash.HashSpi (92%)
create mode 100644 crypto/support/hashes/bcrypt/src/test/groovy/org/apache/shiro/crypto/support/hashes/bcrypt/BCryptHashTest.groovy
copy {config => crypto/support}/pom.xml (69%)
delete mode 100644 samples/jaxrs/pom.xml
delete mode 100644 samples/jaxrs/src/main/java/org/apache/shiro/samples/jaxrs/SampleApplication.java
delete mode 100644 samples/jaxrs/src/main/java/org/apache/shiro/samples/jaxrs/resources/HelloResource.java
delete mode 100644 samples/jaxrs/src/main/java/org/apache/shiro/samples/jaxrs/resources/SecureResource.java
delete mode 100644 samples/jaxrs/src/main/resources/META-INF/NOTICE
delete mode 100644 samples/jaxrs/src/main/resources/shiro.ini
delete mode 100644 samples/jaxrs/src/main/webapp/WEB-INF/web.cxf.xml
delete mode 100644 samples/jaxrs/src/test/groovy/org/apache/shiro/web/jaxrs/ContainerIntegrationIT.groovy
copy support/jaxrs/src/main/java/org/apache/shiro/web/jaxrs/{ExceptionMapper.java => UnauthenticatedExceptionExceptionMapper.java} (56%)
rename support/jaxrs/src/main/java/org/apache/shiro/web/jaxrs/{ExceptionMapper.java => UnauthorizedExceptionExceptionMapper.java} (60%)
delete mode 100644 support/jaxrs/src/test/groovy/org/apache/shiro/web/jaxrs/ExceptionMapperTest.groovy
create mode 100644 support/jaxrs/src/test/groovy/org/apache/shiro/web/jaxrs/UnauthorizedExceptionExceptionMapperTest.groovy
rename support/spring-boot/{spring-boot-web-starter => spring-boot-starter}/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebAutoConfiguration.java (96%)
rename support/spring-boot/{spring-boot-web-starter => spring-boot-starter}/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebFilterConfiguration.java (94%)
rename support/spring-boot/{spring-boot-web-starter => spring-boot-starter}/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebMvcAutoConfiguration.java (90%)
rename support/spring-boot/{spring-boot-web-starter => spring-boot-starter}/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/ConfiguredGlobalFiltersTest.groovy (100%)
rename support/spring-boot/{spring-boot-web-starter => spring-boot-starter}/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/DisabledGlobalFiltersTest.groovy (100%)
rename support/spring-boot/{spring-boot-web-starter => spring-boot-starter}/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/ShiroWebSpringAutoConfigurationTest.groovy (100%)
rename support/spring-boot/{spring-boot-web-starter => spring-boot-starter}/src/test/java/org/apache/shiro/spring/boot/autoconfigure/web/application/ShiroWebAutoConfigurationTestApplication.java (100%)
delete mode 100644 support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/NOTICE
delete mode 100644 support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/spring.factories
delete mode 100644 support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/spring.provides
delete mode 100644 support/spring-boot/spring-boot-web-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/WebSpringFactoriesTest.groovy
delete mode 100644 tools/hasher/src/main/assembly/cli.assembly.xml
rename {samples/jaxrs => tools/hasher}/src/main/resources/logback.xml (73%)
create mode 100644 tools/hasher/src/test/java/org/apache/shiro/tools/hasher/HasherTest.java
copy samples/spring-hibernate/src/main/webapp/index.jsp => tools/hasher/src/test/resources/logback-test.xml (80%)