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/06 16:19:42 UTC
[shiro] branch pr-297-to-main created (now 192159c)
This is an automated email from the ASF dual-hosted git repository.
bdemers pushed a change to branch pr-297-to-main
in repository https://gitbox.apache.org/repos/asf/shiro.git.
at 192159c Add doc note in AesCipherService of Java 14 behavior change
This branch includes the following new commits:
new 8694117 Minor build related changes
new 192159c Add doc note in AesCipherService of Java 14 behavior change
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.
[shiro] 02/02: Add doc note in AesCipherService of Java 14 behavior
change
Posted by bd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bdemers pushed a commit to branch pr-297-to-main
in repository https://gitbox.apache.org/repos/asf/shiro.git
commit 192159c7097aa7cea25665d423648f91ffd06522
Author: Brian Demers <bd...@apache.org>
AuthorDate: Thu May 6 11:31:23 2021 -0400
Add doc note in AesCipherService of Java 14 behavior change
---
.../src/main/java/org/apache/shiro/crypto/cipher/AesCipherService.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/crypto/cipher/src/main/java/org/apache/shiro/crypto/cipher/AesCipherService.java b/crypto/cipher/src/main/java/org/apache/shiro/crypto/cipher/AesCipherService.java
index f8c63b1..3b1a058 100644
--- a/crypto/cipher/src/main/java/org/apache/shiro/crypto/cipher/AesCipherService.java
+++ b/crypto/cipher/src/main/java/org/apache/shiro/crypto/cipher/AesCipherService.java
@@ -89,6 +89,9 @@ public class AesCipherService extends DefaultBlockCipherService {
* <b>**</b>Since {@code GCM} is a stream cipher, padding is implemented in the operation mode and an external padding scheme
* cannot be used in conjunction with {@code GCM}. In fact, {@code AES/GCM/PKCS5Padding} is just an alias in most JVM for
* {@code AES/GCM/NoPadding}.
+ * <p/>
+ * <b>NOTE:</b> As of Java 14, setting a streaming padding for the above example will throw a NoSuchAlgorithmException
+ * @see <a href="https://www.oracle.com/java/technologies/javase/14-relnote-issues.html#JDK-8180392">JDK-8180392</a>
*/
public AesCipherService() {
super(ALGORITHM_NAME);
[shiro] 01/02: Minor build related changes
Posted by bd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bdemers pushed a commit to branch pr-297-to-main
in repository https://gitbox.apache.org/repos/asf/shiro.git
commit 8694117af145acf5c3fd10e8664316dbeef5639a
Author: Brian Demers <bd...@apache.org>
AuthorDate: Thu May 6 11:30:46 2021 -0400
Minor build related changes
* Set shiro.previousVersion to 1.7.1 (less critical, as main is a MAJOR change, but it will help track diffs and create a migration guide)
* combine branch checks into single const
Merged-from: #297
---
.jenkins.groovy | 10 ++++++----
pom.xml | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/.jenkins.groovy b/.jenkins.groovy
index f45a936..d8ce9e0 100644
--- a/.jenkins.groovy
+++ b/.jenkins.groovy
@@ -17,6 +17,8 @@
* under the License.
*/
+const supportedBranch = env.BRANCH_NAME ==~ /(1.7.x|1.8.x|main)/
+
pipeline {
agent none
@@ -104,7 +106,7 @@ pipeline {
stage('Deploy') {
when {
allOf {
- expression { env.BRANCH_NAME ==~ /(1.6.x|1.7.x|main)/ }
+ expression { supportedBranch }
expression { MATRIX_JDK == 'jdk_11_latest' }
// is not a PR (GitHub) / MergeRequest (GitLab) / Change (Gerrit)?
not { changeRequest() }
@@ -123,7 +125,7 @@ pipeline {
// If this build failed, send an email to the list.
failure {
script {
- if (env.BRANCH_NAME == "1.6.x" || env.BRANCH_NAME == "1.7.x" || env.BRANCH_NAME == "main") {
+ if (supportedBranch) {
emailext(
subject: "[BUILD-FAILURE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
body: """
@@ -140,7 +142,7 @@ Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANC
// If this build didn't fail, but there were failing tests, send an email to the list.
unstable {
script {
- if (env.BRANCH_NAME == "1.6.x" || env.BRANCH_NAME == "1.7.x" || env.BRANCH_NAME == "main") {
+ if (supportedBranch) {
emailext(
subject: "[BUILD-UNSTABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
body: """
@@ -160,7 +162,7 @@ Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANC
// (in this cae we probably don't have to do any post-build analysis)
cleanWs()
script {
- if ((env.BRANCH_NAME == "1.6.x" || env.BRANCH_NAME == "1.7.x" || env.BRANCH_NAME == "main")
+ if (supportedBranch
&& (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) {
emailext(
subject: "[BUILD-STABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
diff --git a/pom.xml b/pom.xml
index 0cecf8a..91be17f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
<properties>
- <shiro.previousVersion>1.6.0</shiro.previousVersion>
+ <shiro.previousVersion>1.7.1</shiro.previousVersion>
<!-- Replaced by the build number plugin at build time: -->
<buildNumber>${user.name}-${maven.build.timestamp}</buildNumber>
<jacoco.skip>true</jacoco.skip>