Skip to content

Commit bd63a44

Browse files
committed
chore: openjdk 22 update
1 parent 9765799 commit bd63a44

File tree

6 files changed

+23
-21
lines changed

6 files changed

+23
-21
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
fail-fast: true
4343
matrix:
4444
os: [ ubuntu-latest, macos-latest, windows-latest ]
45-
jdk: [ 21 ]
45+
jdk: [ ea ]
4646
include:
4747
- os: ubuntu-latest
4848
cmd: ./mvnw
@@ -70,12 +70,14 @@ jobs:
7070
with:
7171
website: jdk.java.net
7272
release: ${{ matrix.jdk }}
73+
version: latest
74+
7375
install: false
7476

7577
- name: Download OpenJDK (fallback)
7678
if: ${{ false }}
7779
run: |
78-
download_url="https://download.java.net/java/early_access/jdk21/1/GPL/openjdk-21-ea+1_linux-x64_bin.tar.gz"
80+
download_url="https://download.java.net/java/early_access/jdkea/latest/GPL/openjdk-ea-latest_linux-x64_bin.tar.gz"
7981
wget -O $RUNNER_TEMP/java_package.tar.gz $download_url
8082
8183
- name: Set up OpenJDK ${{ matrix.jdk }} with dep cache

.mvn/extensions.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0"
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
4-
<!--extension>
5-
<groupId>com.soebes.maven.extensions</groupId>
6-
<artifactId>maven-buildtime-profiler</artifactId>
7-
<version>0.2.0</version>
8-
</extension-->
9-
<!--extension>
10-
<groupId>org.apache.maven.extensions</groupId>
11-
<artifactId>maven-build-cache-extension</artifactId>
12-
<version>1.0.0</version>
13-
</extension-->
144
<extension>
155
<groupId>fr.brouillard.oss</groupId>
166
<artifactId>jgitver-maven-plugin</artifactId>
177
<version>1.9.0</version>
188
</extension>
9+
<!--extension>
10+
<groupId>org.apache.maven.extensions</groupId>
11+
<artifactId>maven-build-cache-extension</artifactId>
12+
<version>1.0.1</version>
13+
</extension-->
14+
<!--extension>
15+
<groupId>com.soebes.maven.extensions</groupId>
16+
<artifactId>maven-buildtime-profiler</artifactId>
17+
<version>0.2.0</version>
18+
</extension-->
1919
</extensions>

.mvn/toolchains.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44
<toolchain>
55
<type>jdk</type>
66
<provides>
7-
<version>17</version>
7+
<version>{LTS}</version>
88
<vendor>openjdk</vendor>
99
<!-- vendor>zulu</vendor-->
1010
<!-- vendor>adoptopenjdk</vendor-->
1111
</provides>
1212
<configuration>
13-
<jdkHome>/path/to/jdk/17</jdkHome>
13+
<jdkHome>/path/to/jdk/{LTS}</jdkHome>
1414
</configuration>
1515
</toolchain>
1616
<toolchain>
1717
<type>jdk</type>
1818
<provides>
19-
<version>21</version>
19+
<version>{EA}</version>
2020
<vendor>openjdk</vendor>
2121
</provides>
2222
<configuration>
23-
<jdkHome>/path/to/jdk/21</jdkHome>
23+
<jdkHome>/path/to/jdk/{EA}</jdkHome>
2424
</configuration>
2525
</toolchain>
2626
</toolchains>

.sdkmanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Enable auto-env through the sdkman_auto_env config
22
# Add key=value pairs of SDKs to use below
3-
java=openjdk-ea-21
3+
java=openjdk-ea

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ $ ./mvnw clean versions:display-dependency-updates versions:display-plugin-updat
7777

7878
[java_url]: https://jdk.java.net/
7979

80-
[java_img]: https://img.shields.io/badge/OpenJDK-jdk--21-ea791d?logo=java&style=for-the-badge&logoColor=ea791d
80+
[java_img]: https://img.shields.io/badge/OpenJDK-jdk--22-ea791d?logo=java&style=for-the-badge&logoColor=ea791d
8181

8282
[gha_url]: https://github.com/sureshg/jmh-bench-sample/actions/workflows/build.yml
8383

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<project.build.outputTimestamp>2020-04-19T01:51:00Z</project.build.outputTimestamp>
2222

2323
<!-- Compiler versions -->
24-
<jdk.version>21</jdk.version>
25-
<release.version>21</release.version>
24+
<jdk.version>22</jdk.version>
25+
<release.version>22</release.version>
2626
<maven.version>3.8</maven.version>
2727
<maven.compiler.release>${release.version}</maven.compiler.release>
2828
<!--<maven.compiler.source>${release.version}</maven.compiler.source>-->
@@ -354,7 +354,7 @@
354354
<configuration>
355355
<toolchains>
356356
<jdk>
357-
<version>[17,)</version>
357+
<version>[21,)</version>
358358
</jdk>
359359
</toolchains>
360360
</configuration>

0 commit comments

Comments
 (0)