Skip to content

Commit

Permalink
Merge pull request #72 from fabricepipart1a/feature/jdk-21
Browse files Browse the repository at this point in the history
  • Loading branch information
fabricepipart1a authored Apr 10, 2024
2 parents b848a21 + 3afbb81 commit 258ae95
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
- uses: actions/checkout@v4
with:
token: ${{ github.event_name == 'pull_request' && secrets.GITHUB_TOKEN || secrets.TAG_PAT_TOKEN }}
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: 17
java-version: 21
distribution: "adopt"
- name: Cache Maven packages
uses: actions/cache@v4
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
- uses: actions/checkout@v4
- uses: graalvm/setup-graalvm@v1
with:
version: '22.3.2'
java-version: '17'
distribution: 'graalvm'
java-version: '21'
components: 'native-image'
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: Cache Maven packages
Expand Down Expand Up @@ -50,8 +50,8 @@ jobs:
- uses: actions/checkout@v4
- uses: graalvm/setup-graalvm@v1
with:
version: '22.3.2'
java-version: '17'
distribution: 'graalvm'
java-version: '21'
components: 'native-image'
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: Cache Maven packages
Expand Down Expand Up @@ -80,8 +80,8 @@ jobs:
- uses: actions/checkout@v4
- uses: graalvm/setup-graalvm@v1
with:
version: '22.3.2'
java-version: '17'
distribution: 'graalvm'
java-version: '21'
components: 'native-image'
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: Cache Maven packages
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: 17
java-version: 21
distribution: 'adopt'
- name: Cache SonarCloud packages
uses: actions/cache@v4
Expand Down
4 changes: 2 additions & 2 deletions contribute.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

To compile and run this app you will need:

- JDK 17
- JDK 21
- Maven 3.8+

### How to build locally
Expand Down Expand Up @@ -66,7 +66,7 @@ impacted by your live changes, just type `r`.

To compile and run this demo you will need:

- JDK 17+
- JDK 21+
- GraalVM (See the [Building a Native Executable guide](https://quarkus.io/guides/building-native-image-guide)
for help setting up your environment.)

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<compiler-plugin.version>3.13.0</compiler-plugin.version>
<mandrel.docker.version>22.3</mandrel.docker.version>
<maven.compiler.parameters>true</maven.compiler.parameters>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
Expand Down Expand Up @@ -206,7 +206,7 @@
<quarkus.container-image.build>true</quarkus.container-image.build>
<quarkus.native.container-build>true</quarkus.native.container-build>
<quarkus.native.builder-image>
quay.io/quarkus/ubi-quarkus-mandrel-builder-image:${mandrel.docker.version}-java17
quay.io/quarkus/ubi-quarkus-mandrel-builder-image:${mandrel.docker.version}-java21
</quarkus.native.builder-image>
<quarkus.package.type>native</quarkus.package.type>
<quarkus.container-image.tag>${project.version}</quarkus.container-image.tag>
Expand Down

0 comments on commit 258ae95

Please sign in to comment.