Skip to content

Commit

Permalink
[UNDERTOW-2523] Require a minimum of Java 17 in preparation for Jakar…
Browse files Browse the repository at this point in the history
…ta Servlet 6.1

https://issues.redhat.com/browse/UNDERTOW-2523
Signed-off-by: James R. Perkins <jperkins@redhat.com>
  • Loading branch information
jamezp committed Dec 3, 2024
1 parent a4720e3 commit 27d7983
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
build-all:
name: Compile (no tests) with JDK 11
name: Compile (no tests) with JDK 17
runs-on: ubuntu-latest
steps:
- uses: n1hility/cancel-previous-runs@v2
Expand All @@ -23,11 +23,11 @@ jobs:
restore-keys: |
m2-
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Generate settings.xml for Maven Builds
uses: whelk-io/maven-settings-xml-action@v20
with:
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
module: [core]
jdk: [11, 17, 21]
jdk: [17, 21]
openjdk_impl: [ temurin ]
steps:
- name: Update hosts - linux
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
os: [ubuntu-latest]
module: [core, servlet, websockets-jsr]
proxy: ['-Pproxy', '']
jdk: [11]
jdk: [17]
steps:
- name: Update hosts - linux
if: matrix.os == 'ubuntu-latest'
Expand Down
5 changes: 3 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,9 @@
<version.bundle.plugin>5.1.1</version.bundle.plugin>

<version.jmh>1.21</version.jmh>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.release>17</maven.compiler.release>
<maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
<maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
<maven.javadoc.plugin.quiet>true</maven.javadoc.plugin.quiet>
<maven.compiler.showDeprecation>false</maven.compiler.showDeprecation>
<maven.compiler.showWarnings>false</maven.compiler.showWarnings>
Expand Down

0 comments on commit 27d7983

Please sign in to comment.