Skip to content

Commit

Permalink
chore: openjdk 22 update
Browse files Browse the repository at this point in the history
  • Loading branch information
sureshg committed Jun 19, 2023
1 parent 9765799 commit bd63a44
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 21 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
fail-fast: true
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
jdk: [ 21 ]
jdk: [ ea ]
include:
- os: ubuntu-latest
cmd: ./mvnw
Expand Down Expand Up @@ -70,12 +70,14 @@ jobs:
with:
website: jdk.java.net
release: ${{ matrix.jdk }}
version: latest

install: false

- name: Download OpenJDK (fallback)
if: ${{ false }}
run: |
download_url="https://download.java.net/java/early_access/jdk21/1/GPL/openjdk-21-ea+1_linux-x64_bin.tar.gz"
download_url="https://download.java.net/java/early_access/jdkea/latest/GPL/openjdk-ea-latest_linux-x64_bin.tar.gz"
wget -O $RUNNER_TEMP/java_package.tar.gz $download_url
- name: Set up OpenJDK ${{ matrix.jdk }} with dep cache
Expand Down
20 changes: 10 additions & 10 deletions .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
<!--extension>
<groupId>com.soebes.maven.extensions</groupId>
<artifactId>maven-buildtime-profiler</artifactId>
<version>0.2.0</version>
</extension-->
<!--extension>
<groupId>org.apache.maven.extensions</groupId>
<artifactId>maven-build-cache-extension</artifactId>
<version>1.0.0</version>
</extension-->
<extension>
<groupId>fr.brouillard.oss</groupId>
<artifactId>jgitver-maven-plugin</artifactId>
<version>1.9.0</version>
</extension>
<!--extension>
<groupId>org.apache.maven.extensions</groupId>
<artifactId>maven-build-cache-extension</artifactId>
<version>1.0.1</version>
</extension-->
<!--extension>
<groupId>com.soebes.maven.extensions</groupId>
<artifactId>maven-buildtime-profiler</artifactId>
<version>0.2.0</version>
</extension-->
</extensions>
8 changes: 4 additions & 4 deletions .mvn/toolchains.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
<toolchain>
<type>jdk</type>
<provides>
<version>17</version>
<version>{LTS}</version>
<vendor>openjdk</vendor>
<!-- vendor>zulu</vendor-->
<!-- vendor>adoptopenjdk</vendor-->
</provides>
<configuration>
<jdkHome>/path/to/jdk/17</jdkHome>
<jdkHome>/path/to/jdk/{LTS}</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
<version>21</version>
<version>{EA}</version>
<vendor>openjdk</vendor>
</provides>
<configuration>
<jdkHome>/path/to/jdk/21</jdkHome>
<jdkHome>/path/to/jdk/{EA}</jdkHome>
</configuration>
</toolchain>
</toolchains>
2 changes: 1 addition & 1 deletion .sdkmanrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Enable auto-env through the sdkman_auto_env config
# Add key=value pairs of SDKs to use below
java=openjdk-ea-21
java=openjdk-ea
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ $ ./mvnw clean versions:display-dependency-updates versions:display-plugin-updat

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

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

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

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<project.build.outputTimestamp>2020-04-19T01:51:00Z</project.build.outputTimestamp>

<!-- Compiler versions -->
<jdk.version>21</jdk.version>
<release.version>21</release.version>
<jdk.version>22</jdk.version>
<release.version>22</release.version>
<maven.version>3.8</maven.version>
<maven.compiler.release>${release.version}</maven.compiler.release>
<!--<maven.compiler.source>${release.version}</maven.compiler.source>-->
Expand Down Expand Up @@ -354,7 +354,7 @@
<configuration>
<toolchains>
<jdk>
<version>[17,)</version>
<version>[21,)</version>
</jdk>
</toolchains>
</configuration>
Expand Down

0 comments on commit bd63a44

Please sign in to comment.