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

[SHIRO-840] Java 17 support. #321

Merged
merged 1 commit into from
Sep 28, 2021
Merged

[SHIRO-840] Java 17 support. #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: actions/checkout@v2

- name: Set up JDK
uses: actions/setup-java@v2.1.0
uses: actions/setup-java@v2
with:
java-version: 8
distribution: adopt-hotspot
Expand All @@ -42,7 +42,7 @@ jobs:
run: mvn apache-rat:check "-Drat.consoleOutput"

- name: Build with Maven
run: mvn verify --errors --batch-mode --no-transfer-progress -Pdocs
run: mvn verify --show-version --errors --batch-mode --no-transfer-progress -Pdocs

build-all:
needs: build
Expand All @@ -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
Expand All @@ -83,7 +83,7 @@ jobs:
- os: macOS-latest
java:
version: 16
# exclude adopt-hotspot on MacOS. zulu (also hotspot) and OpenJ9 are sufficient.
# exclude temurin on MacOS. zulu (also hotspot) and OpenJ9 are sufficient.
- os: macOS-latest
java:
dist: adopt-hotspot
Expand All @@ -107,10 +107,10 @@ jobs:
maven-${{ matrix.os }}-

- name: Set up JDK
uses: actions/setup-java@v2.1.0
uses: actions/setup-java@v2
with:
java-version: ${{ matrix.java.version }}
distribution: ${{ matrix.java.dist }}

- name: Build with Maven
run: mvn verify --errors --batch-mode --no-transfer-progress -Pdocs
run: mvn verify --show-version --errors --batch-mode --no-transfer-progress -Pdocs
2 changes: 1 addition & 1 deletion .jenkins.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ pipeline {
stage('Build') {
steps {
echo 'Building'
sh 'mvn --update-snapshots --batch-mode --errors clean verify -Pdocs -Dmaven.test.failure.ignore=true'
sh 'mvn clean verify --show-version --errors --batch-mode --no-transfer-progress -Pdocs -Dmaven.test.failure.ignore=true'
}
post {
always {
Expand Down
11 changes: 11 additions & 0 deletions integration-tests/guice3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
11 changes: 11 additions & 0 deletions integration-tests/guice4/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
12 changes: 6 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
11 changes: 11 additions & 0 deletions samples/guice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
12 changes: 11 additions & 1 deletion support/guice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>