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/09/23 19:58:18 UTC
[shiro] branch java17support created (now dce866d)
This is an automated email from the ASF dual-hosted git repository.
bmarwell pushed a change to branch java17support
in repository https://gitbox.apache.org/repos/asf/shiro.git.
at dce866d [BUILD] Java 17 support.
This branch includes the following new commits:
new dce866d [BUILD] Java 17 support.
The 1 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] 01/01: [BUILD] Java 17 support.
Posted by bm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bmarwell pushed a commit to branch java17support
in repository https://gitbox.apache.org/repos/asf/shiro.git
commit dce866d2944ff10f77770f55e555e92eaabecb91
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Thu Sep 23 21:58:50 2021 +0200
[BUILD] Java 17 support.
---
.github/workflows/maven.yml | 8 ++++----
.jenkins.groovy | 2 +-
integration-tests/guice3/pom.xml | 11 +++++++++++
integration-tests/guice4/pom.xml | 11 +++++++++++
pom.xml | 12 ++++++------
samples/guice/pom.xml | 11 +++++++++++
support/guice/pom.xml | 12 +++++++++++-
7 files changed, 55 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 40bebb8..e786918 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -65,12 +65,12 @@ jobs:
dist: adopt-openj9
- version: 11
dist: zulu
- # 16
- - version: 16
- dist: adopt-hotspot
+ # 17 (16 fallback)
+ - version: 17
+ dist: temurin
- version: 16
dist: adopt-openj9
- - version: 16
+ - version: 17
dist: zulu
exclude:
# was already built
diff --git a/.jenkins.groovy b/.jenkins.groovy
index 769baee..a948bab 100644
--- a/.jenkins.groovy
+++ b/.jenkins.groovy
@@ -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.
}
diff --git a/integration-tests/guice3/pom.xml b/integration-tests/guice3/pom.xml
index e335cbb..29d62a6 100644
--- a/integration-tests/guice3/pom.xml
+++ b/integration-tests/guice3/pom.xml
@@ -135,5 +135,16 @@
<failsafe.argLine>--illegal-access=permit</failsafe.argLine>
</properties>
</profile>
+ <profile>
+ <id>jdk17</id>
+ <activation>
+ <jdk>[17,)</jdk>
+ </activation>
+ <properties>
+ <!-- needed by guice until it is compatible with jdk17+. -->
+ <surefire.argLine>--add-opens java.base/java.lang=ALL-UNNAMED</surefire.argLine>
+ <failsafe.argLine>--add-opens java.base/java.lang=ALL-UNNAMED</failsafe.argLine>
+ </properties>
+ </profile>
</profiles>
</project>
diff --git a/integration-tests/guice4/pom.xml b/integration-tests/guice4/pom.xml
index 0e5af10..4d4c3b0 100644
--- a/integration-tests/guice4/pom.xml
+++ b/integration-tests/guice4/pom.xml
@@ -140,5 +140,16 @@
<failsafe.argLine>--illegal-access=permit</failsafe.argLine>
</properties>
</profile>
+ <profile>
+ <id>jdk17</id>
+ <activation>
+ <jdk>[17,)</jdk>
+ </activation>
+ <properties>
+ <!-- needed by guice until it is compatible with jdk17+. -->
+ <surefire.argLine>--add-opens java.base/java.lang=ALL-UNNAMED</surefire.argLine>
+ <failsafe.argLine>--add-opens java.base/java.lang=ALL-UNNAMED</failsafe.argLine>
+ </properties>
+ </profile>
</profiles>
</project>
diff --git a/pom.xml b/pom.xml
index 2011d5a..61204c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,17 +109,17 @@
<log4j.version>1.2.17</log4j.version>
<spring.version>5.2.8.RELEASE</spring.version>
<spring-boot.version>2.3.2.RELEASE</spring-boot.version>
- <guice.version>4.2.2</guice.version>
+ <guice.version>4.2.3</guice.version>
<jaxrs.api.version>2.1.6</jaxrs.api.version>
<htmlunit.version>2.39.0</htmlunit.version>
<bouncycastle.version>1.68</bouncycastle.version>
<!-- Test 3rd-party dependencies: -->
<easymock.version>4.0.2</easymock.version>
- <mockito.version>3.7.0</mockito.version>
- <gmaven.version>1.12.0</gmaven.version>
- <groovy.version>3.0.7</groovy.version>
- <junit.version>5.6.2</junit.version>
+ <mockito.version>3.12.4</mockito.version>
+ <gmaven.version>1.13.0</gmaven.version>
+ <groovy.version>3.0.9</groovy.version>
+ <junit.version>5.8.1</junit.version>
<junit.server.jetty.version>0.11.0</junit.server.jetty.version>
<hibernate.version>5.4.3.Final</hibernate.version>
<taglibs.standard.version>1.2.5</taglibs.standard.version>
@@ -334,7 +334,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.6</version>
+ <version>0.8.7</version>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
diff --git a/samples/guice/pom.xml b/samples/guice/pom.xml
index f1bcaeb..50afb36 100644
--- a/samples/guice/pom.xml
+++ b/samples/guice/pom.xml
@@ -125,5 +125,16 @@
<failsafe.argLine>--illegal-access=permit</failsafe.argLine>
</properties>
</profile>
+ <profile>
+ <id>jdk17</id>
+ <activation>
+ <jdk>[17,)</jdk>
+ </activation>
+ <properties>
+ <!-- needed by guice until it is compatible with jdk17+. -->
+ <surefire.argLine>--add-opens java.base/java.lang=ALL-UNNAMED</surefire.argLine>
+ <failsafe.argLine>--add-opens java.base/java.lang=ALL-UNNAMED</failsafe.argLine>
+ </properties>
+ </profile>
</profiles>
</project>
diff --git a/support/guice/pom.xml b/support/guice/pom.xml
index 26d332c..7c76e2b 100644
--- a/support/guice/pom.xml
+++ b/support/guice/pom.xml
@@ -128,12 +128,22 @@
<profile>
<id>jdk16</id>
<activation>
- <jdk>[16,)</jdk>
+ <jdk>[16,17)</jdk>
</activation>
<properties>
<!-- needed by guice until it is compatible with jdk16+. -->
<surefire.argLine>--illegal-access=permit</surefire.argLine>
</properties>
</profile>
+ <profile>
+ <id>jdk17</id>
+ <activation>
+ <jdk>[17,)</jdk>
+ </activation>
+ <properties>
+ <!-- needed by guice until it is compatible with jdk17+. -->
+ <surefire.argLine>--add-opens java.base/java.lang=ALL-UNNAMED</surefire.argLine>
+ </properties>
+ </profile>
</profiles>
</project>