Skip to content

Commit

Permalink
Support JDK 17
Browse files Browse the repository at this point in the history
  • Loading branch information
tobiasschaefer committed Oct 12, 2021
1 parent 3f55c6b commit bdea60f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 24 deletions.
14 changes: 5 additions & 9 deletions .github/workflows/continous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,15 @@ jobs:
strategy:
fail-fast: false
matrix:
java: ['11', '16'] #Support LTS releases 8 and 11 and the latest release supported by Micronaut.
java: ['8', '11', '17'] #Support LTS releases 8, 11 and 17 and the latest release supported by Micronaut.
runtime: ['netty']
gradle_args: ['-Dorg.gradle.jvmargs=--illegal-access=permit']
include: # Test more server runtimes on Java 8 only (to reduce number of combinations)
- java: '8'
runtime: 'netty'
gradle_args: ''
- java: '8'
runtime: 'jetty'
gradle_args: ''
- java: '8'
runtime: 'tomcat'
gradle_args: ''
- java: '8'
runtime: 'undertow'
gradle_args: ''

steps:
- name: Git Checkout
Expand All @@ -42,5 +35,8 @@ jobs:
distribution: 'zulu'
java-version: ${{ matrix.java }}
cache: 'gradle'
- name: Set JVM options for JDK 11
if: ${{ matrix.java == '11' }}
run: GRADLE_ARGS='-Dorg.gradle.jvmargs=--illegal-access=permit'
- name: Build with Gradle Wrapper
run: ./gradlew build --warning-mode=fail -Pmicronaut.runtime=${{ matrix.runtime }} ${{ matrix.gradle_args }}
run: ./gradlew build --warning-mode=fail -Pmicronaut.runtime=${{ matrix.runtime }} $GRADLE_ARGS
19 changes: 6 additions & 13 deletions .github/workflows/nightly-all-combinations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,9 @@ jobs:
strategy:
fail-fast: false
matrix:
java: ['11', '16'] #Support LTS releases 8 and 11 and the latest release supported by Micronaut. Note: JDK 8 is not covered here because it would require org.gradle.jvmargs not to be set making the configuration more complex - however JDK 8 is already fully covered in the continuous-integration.yml
java: ['8', '11', '17'] #Support LTS releases 8, 11 and 17 and the latest release supported by Micronaut. Note: JDK 8 is not covered here because it would require org.gradle.jvmargs not to be set making the configuration more complex - however JDK 8 is already fully covered in the continuous-integration.yml
runtime: ['netty', 'jetty', 'tomcat', 'undertow']
jdk_java_options: ['']
include:
- java: '16' # special configuration for Tomcat on JDK 16, see #296
runtime: 'tomcat'
jdk_java_options: '--add-opens=java.base/java.io=ALL-UNNAMED'
exclude:
- java: '16'
runtime: 'tomcat'
jdk_java_options: ''

steps:
- name: Git Checkout
uses: actions/checkout@v2
Expand All @@ -35,7 +27,8 @@ jobs:
distribution: 'zulu'
java-version: ${{ matrix.java }}
cache: 'gradle'
- name: Set JVM options for JDK 11
if: ${{ matrix.java == '11' }}
run: GRADLE_ARGS='-Dorg.gradle.jvmargs=--illegal-access=permit'
- name: Build with Gradle Wrapper
run: ./gradlew build --warning-mode=fail -Pmicronaut.runtime=${{ matrix.runtime }} -Dorg.gradle.jvmargs=--illegal-access=permit
env:
JDK_JAVA_OPTIONS: ${{ matrix.jdk_java_options }}
run: ./gradlew build --warning-mode=fail -Pmicronaut.runtime=${{ matrix.runtime }} $GRADLE_ARGS
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Here are some example applications:
We officially support the following JDKs:
* JDK 8 (LTS)
* JDK 11 (LTS)
* JDK 16 (the latest version supported by Micronaut)
* JDK 17 (LTS)

## Dependency Management

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The project property 'version' is overwritten via .github/workflows/publish-release.yml
version=0.0.1-SNAPSHOT
kotlinVersion=1.5.21
kotlinVersion=1.6.0-RC
micronautVersion=3.1.0
micronautApplicationPluginVersion=2.0.6
micronautLibraryPluginVersion=2.0.6
Expand Down

0 comments on commit bdea60f

Please sign in to comment.