Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pr 297 to main #298

Merged
merged 3 commits into from
May 7, 2021
Merged

Pr 297 to main #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb4da53
Minor build related changes
bdemers May 6, 2021
bc7fa33
Add doc note in AesCipherService of Java 14 behavior change
bdemers May 6, 2021
2588375
Rename var in jenkinsfile
bdemers May 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .jenkins.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
* under the License.
*/

def deployableBranch = env.BRANCH_NAME ==~ /(1.7.x|1.8.x|main)/

pipeline {

agent none
Expand Down Expand Up @@ -104,7 +106,7 @@ pipeline {
stage('Deploy') {
when {
allOf {
expression { env.BRANCH_NAME ==~ /(1.6.x|1.7.x|main)/ }
expression { deployableBranch }
expression { MATRIX_JDK == 'jdk_11_latest' }
// is not a PR (GitHub) / MergeRequest (GitLab) / Change (Gerrit)?
not { changeRequest() }
Expand All @@ -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 (deployableBranch) {
emailext(
subject: "[BUILD-FAILURE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
body: """
Expand All @@ -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 (deployableBranch) {
emailext(
subject: "[BUILD-UNSTABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
body: """
Expand All @@ -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 (deployableBranch
&& (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) {
emailext(
subject: "[BUILD-STABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
Expand Down
3 changes: 3 additions & 0 deletions crypto/cipher/src/main/java/org/apache/shiro/crypto/cipher/AesCipherService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down