diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 47e5d516..782be484 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,10 +16,13 @@ on: jobs: build-feature: - name: Build + name: Build + permissions: + contents: read uses: navikt/fp-gha-workflows/.github/workflows/build-feature.yml@main with: sonar-scan: true # default: false + java-version: 21 secrets: inherit release-drafter: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 0bfc848b..c9cc7092 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -16,4 +16,6 @@ jobs: contents: read security-events: write uses: navikt/fp-gha-workflows/.github/workflows/codeql.yml@main + with: + java-version: 21 secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0fdf38c1..d334d937 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,4 +11,5 @@ jobs: uses: navikt/fp-gha-workflows/.github/workflows/release-feature.yml@main with: release-version: ${{ github.event.release.tag_name }} + java-version: 21 secrets: inherit diff --git a/.java-version b/.java-version index 98d9bcb7..aabe6ec3 100644 --- a/.java-version +++ b/.java-version @@ -1 +1 @@ -17 +21 diff --git a/README.md b/README.md index de52775d..dc5cc881 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Inneholder tre tjenester for foreldrepenger: # Komme i gang -Bygges med maven, java 17 +Bygges med maven, java 21 ## For NAV-ansatte diff --git a/pom.xml b/pom.xml index 578f7051..67474816 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ - 17 + 21 ${java.version} ${java.version} UTF-8