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/10/07 12:39:53 UTC

[shiro] branch main updated: [SHIRO-840] Use Java17 buildjob on Jenkins

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 5b8e458  [SHIRO-840] Use Java17 buildjob on Jenkins
     new df2f548  Merge pull request #328 from bmarwell/java17_jenkins
5b8e458 is described below

commit 5b8e45885381c22d382f8298bf289db2f9f78797
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Thu Oct 7 13:02:17 2021 +0200

    [SHIRO-840] Use Java17 buildjob on Jenkins
---
 .jenkins.groovy | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.jenkins.groovy b/.jenkins.groovy
index 769baee..7025fd3 100644
--- a/.jenkins.groovy
+++ b/.jenkins.groovy
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-def deployableBranch = env.BRANCH_NAME ==~ /(1.7.x|1.8.x|main)/
+def deployableBranch = env.BRANCH_NAME ==~ /(1.7.x|1.8.x|1.9.x|main)/
 
 pipeline {
 
@@ -38,7 +38,7 @@ pipeline {
                         name 'MATRIX_JDK'
                         values 'jdk_1.8_latest', 'adopt_hs_8_latest', 'adopt_j9_8_latest',
                                 'jdk_11_latest', 'adopt_hs_11_latest', 'adopt_j9_11_latest',
-                                'jdk_16_latest', 'adopt_hs_16_latest', 'adopt_j9_16_latest'
+                                'jdk_17_latest', 'adopt_hs_16_latest', 'adopt_j9_16_latest'
                     }
                     // Additional axes, like OS and maven version can be configured here.
                 }