This is an automated email from the ASF dual-hosted git repository. lprimak pushed a commit to branch 3.x in repository https://gitbox.apache.org/repos/asf/shiro.git
commit b988f57f9b3670d8d7daf702c19844a5d8b9cc50 Author: lprimak <[email protected]> AuthorDate: Wed Feb 4 17:16:54 2026 -0600 fixed deferred profile --- .mvn/maven.config | 2 +- .../org/apache/shiro/crypto/support/hashes/bcrypt/BCryptHash.java | 3 +-- pom.xml | 8 -------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.mvn/maven.config b/.mvn/maven.config index 6dc2f97ef..9e6e1bb97 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -1,2 +1,2 @@ --Dskip.deferred.modules +-P-deferred-for-3x -Djapicmp.skip=true diff --git a/crypto/support/hashes/bcrypt/src/main/java/org/apache/shiro/crypto/support/hashes/bcrypt/BCryptHash.java b/crypto/support/hashes/bcrypt/src/main/java/org/apache/shiro/crypto/support/hashes/bcrypt/BCryptHash.java index e4a341965..28db6812e 100644 --- a/crypto/support/hashes/bcrypt/src/main/java/org/apache/shiro/crypto/support/hashes/bcrypt/BCryptHash.java +++ b/crypto/support/hashes/bcrypt/src/main/java/org/apache/shiro/crypto/support/hashes/bcrypt/BCryptHash.java @@ -23,7 +23,6 @@ import org.apache.shiro.crypto.hash.AbstractCryptHash; import org.apache.shiro.lang.util.ByteSource; import org.apache.shiro.lang.util.SimpleByteSource; import org.bouncycastle.crypto.generators.OpenBSDBCrypt; -import org.checkerframework.checker.nullness.qual.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -214,7 +213,7 @@ class BCryptHash extends AbstractCryptHash { .toString(); } - private static @NonNull String getBcryptVersion(String algorithmName) { + private static String getBcryptVersion(String algorithmName) { if (algorithmName.startsWith(BCRYPT_ALGORITHM_BASE)) { algorithmName = algorithmName.substring(BCRYPT_ALGORITHM_BASE.length()); } diff --git a/pom.xml b/pom.xml index 2f1f473d4..01c7e7247 100644 --- a/pom.xml +++ b/pom.xml @@ -1803,14 +1803,6 @@ </plugins> </build> </profile> - <profile> - <id>deferred-for-3x</id> - <activation> - <property> - <name>!skip.deferred.modules</name> - </property> - </activation> - </profile> </profiles> <!--Disable snapshot repositories because they download snapshots instead of using the current build in CI 'mvn verify' steps-->
