You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lp...@apache.org on 2023/01/23 17:33:17 UTC
[shiro] branch main updated: [SHIRO-904] update minimum to jdk 11
This is an automated email from the ASF dual-hosted git repository.
lprimak 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 3c64f53a [SHIRO-904] update minimum to jdk 11
new 84fc8828 Merge pull request #657 from lprimak/jdk-11-minimum
3c64f53a is described below
commit 3c64f53a2f8df1c3028e11b7f3d9eee76d1e2269
Author: lprimak <le...@flowlogix.com>
AuthorDate: Thu Jan 19 20:22:30 2023 -0600
[SHIRO-904] update minimum to jdk 11
---
.github/workflows/maven.yml | 13 ++++++++-----
.jenkins.groovy | 5 ++---
pom.xml | 7 +++----
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index f296823d..4e3d256d 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -20,9 +20,9 @@ name: Maven CI
on:
workflow_dispatch: {}
push:
- branches: [ main, '1.10.x', '1.9.x' ]
+ branches: [ main, '1.11.x', '1.10.x', '1.9.x' ]
pull_request:
- branches: [ main, '1.10.x', '1.9.x' ]
+ branches: [ main, '1.11.x', '1.10.x', '1.9.x' ]
jobs:
build:
@@ -35,7 +35,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
- java-version: 8
+ java-version: 11
distribution: temurin
- name: License Check
@@ -50,12 +50,12 @@ jobs:
strategy:
matrix:
os: [ 'ubuntu-latest', 'windows-latest', 'macOS-latest' ]
- jdk: [ 8, 11, 17 ]
+ jdk: [ 11, 17, 19 ]
dist: [ 'temurin', 'adopt-openj9', 'zulu' ]
exclude:
# was already built
- os: 'ubuntu-latest'
- jdk: 8
+ jdk: 11
dist: 'temurin'
# exclude some builds, because MacOs builds have fewer resources available.
# excludes java 16 on macOS.
@@ -64,6 +64,9 @@ jobs:
# exclude temurin on MacOS. zulu (also hotspot) and OpenJ9 are sufficient.
- os: 'macOS-latest'
dist: 'temurin'
+ # no OpenJ9 19
+ - dist: adopt-openj9
+ jdk: 19
fail-fast: false
runs-on: ${{ matrix.os }}
diff --git a/.jenkins.groovy b/.jenkins.groovy
index 5d718496..27138c35 100644
--- a/.jenkins.groovy
+++ b/.jenkins.groovy
@@ -36,9 +36,8 @@ pipeline {
axis {
// https://cwiki.apache.org/confluence/display/INFRA/JDK+Installation+Matrix
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_17_latest', 'adopt_hs_16_latest', 'adopt_j9_16_latest'
+ values 'jdk_11_latest', 'adopt_hs_11_latest', 'adopt_j9_11_latest',
+ 'jdk_17_latest', 'adopt_j9_16_latest', 'jdk_19_latest'
}
// Additional axes, like OS and maven version can be configured here.
}
diff --git a/pom.xml b/pom.xml
index 1d60b895..513b0ab3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
<hazelcast.version>5.1.3</hazelcast.version>
<hsqldb.version>2.5.0</hsqldb.version>
<javax.annotation.api.version>1.3.2</javax.annotation.api.version>
- <jdk.version>1.8</jdk.version>
+ <jdk.version>11</jdk.version>
<jetty.version>9.4.34.v20201102</jetty.version>
<owasp.java.encoder.version>1.2.3</owasp.java.encoder.version>
<!-- Don't change this version without also changing the shiro-quartz and shiro-features
@@ -126,8 +126,7 @@
<hibernate.version>5.6.14.Final</hibernate.version>
<taglibs.standard.version>1.2.5</taglibs.standard.version>
- <maven.compiler.source>${jdk.version}</maven.compiler.source>
- <maven.compiler.target>${jdk.version}</maven.compiler.target>
+ <maven.compiler.release>${jdk.version}</maven.compiler.release>
<root.dir>${session.executionRootDirectory}</root.dir>
@@ -743,7 +742,7 @@
<version>[3.5.0,4)</version>
</requireMavenVersion>
<requireJavaVersion>
- <version>[1.8,)</version>
+ <version>[11,)</version>
</requireJavaVersion>
</rules>
</configuration>