chore: migrate to java 21 (#5163)
This commit is contained in:
parent
d77d9010a8
commit
5ee98eeb48
@ -1,8 +1,8 @@
|
|||||||
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.238.0/containers/java/.devcontainer/base.Dockerfile
|
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.238.0/containers/java/.devcontainer/base.Dockerfile
|
||||||
|
|
||||||
# [Choice] Java version (use -bullseye variants on local arm64/Apple Silicon): 11, 17, 11-bullseye, 17-bullseye, 11-buster, 17-buster
|
# [Choice] Java version (use -bullseye variants on local arm64/Apple Silicon): 11, 17, 11-bullseye, 17-bullseye, 11-buster, 17-buster
|
||||||
ARG VARIANT="17-bullseye"
|
ARG VARIANT="21-bullseye"
|
||||||
FROM mcr.microsoft.com/vscode/devcontainers/java:0-${VARIANT}
|
FROM mcr.microsoft.com/vscode/devcontainers/java:1.1.0-${VARIANT}
|
||||||
|
|
||||||
# [Option] Install Maven
|
# [Option] Install Maven
|
||||||
ARG INSTALL_MAVEN="false"
|
ARG INSTALL_MAVEN="false"
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
// Update the VARIANT arg to pick a Java version: 11, 17
|
// Update the VARIANT arg to pick a Java version: 11, 17
|
||||||
// Append -bullseye or -buster to pin to an OS version.
|
// Append -bullseye or -buster to pin to an OS version.
|
||||||
// Use the -bullseye variants on local arm64/Apple Silicon.
|
// Use the -bullseye variants on local arm64/Apple Silicon.
|
||||||
"VARIANT": "17-bullseye",
|
"VARIANT": "21-bullseye",
|
||||||
// Options
|
// Options
|
||||||
"INSTALL_MAVEN": "true",
|
"INSTALL_MAVEN": "true",
|
||||||
"INSTALL_GRADLE": "true",
|
"INSTALL_GRADLE": "true",
|
||||||
|
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
@ -6,10 +6,10 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Set up JDK 17
|
- name: Set up JDK
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
java-version: 17
|
java-version: 21
|
||||||
distribution: 'adopt'
|
distribution: 'adopt'
|
||||||
- name: Build with Maven
|
- name: Build with Maven
|
||||||
run: mvn --batch-mode --update-snapshots verify
|
run: mvn --batch-mode --update-snapshots verify
|
||||||
|
4
.github/workflows/codeql.yml
vendored
4
.github/workflows/codeql.yml
vendored
@ -26,10 +26,10 @@ jobs:
|
|||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set up JDK 17
|
- name: Set up JDK
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
java-version: 17
|
java-version: 21
|
||||||
distribution: 'adopt'
|
distribution: 'adopt'
|
||||||
|
|
||||||
- name: Initialize CodeQL
|
- name: Initialize CodeQL
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM gitpod/workspace-java-17:2024-05-13-09-12-40
|
FROM gitpod/workspace-java-21:2024-05-15-13-36-34
|
||||||
|
|
||||||
ENV LLVM_SCRIPT="tmp_llvm.sh"
|
ENV LLVM_SCRIPT="tmp_llvm.sh"
|
||||||
|
|
||||||
|
10
pom.xml
10
pom.xml
@ -10,8 +10,8 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
<maven.compiler.source>21</maven.compiler.source>
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
<maven.compiler.target>21</maven.compiler.target>
|
||||||
<assertj.version>3.25.3</assertj.version>
|
<assertj.version>3.25.3</assertj.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
@ -73,8 +73,8 @@
|
|||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.13.0</version>
|
<version>3.13.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>17</source>
|
<source>21</source>
|
||||||
<target>17</target>
|
<target>21</target>
|
||||||
<compilerArgs>
|
<compilerArgs>
|
||||||
<arg>-Xlint:all</arg>
|
<arg>-Xlint:all</arg>
|
||||||
<arg>-Xlint:-auxiliaryclass</arg>
|
<arg>-Xlint:-auxiliaryclass</arg>
|
||||||
@ -82,6 +82,8 @@
|
|||||||
<arg>-Xlint:-serial</arg>
|
<arg>-Xlint:-serial</arg>
|
||||||
<arg>-Xlint:-try</arg>
|
<arg>-Xlint:-try</arg>
|
||||||
<arg>-Xlint:-unchecked</arg>
|
<arg>-Xlint:-unchecked</arg>
|
||||||
|
<arg>-Xlint:-lossy-conversions</arg>
|
||||||
|
<arg>-Xlint:-this-escape</arg>
|
||||||
<arg>-Werror</arg>
|
<arg>-Werror</arg>
|
||||||
</compilerArgs>
|
</compilerArgs>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
Loading…
Reference in New Issue
Block a user