diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0caebd0..37dd80e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,6 +26,7 @@ jobs: uses: navikt/fp-gha-workflows/.github/workflows/build-feature-postgres.yml@main with: postgres-user: unittest + java-version: 21 secrets: inherit release-drafter: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 0bfc848..cc8dc90 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 edf152e..f16e537 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 98d9bcb..aabe6ec 100644 --- a/.java-version +++ b/.java-version @@ -1 +1 @@ -17 +21 diff --git a/pom.xml b/pom.xml index 3b73ad2..1bfb0ec 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ - 17 + 21 UTF-8 UTF-8 -Xms256m -Dlog.level.no.nav=WARN -Dfile.encoding=${project.build.sourceEncoding} @@ -53,7 +53,7 @@ fp-prosesstask navikt_fp-prosesstask - 5.1.1 + 5.1.3 9.1.0 6.1.7.Final @@ -181,7 +181,7 @@ org.junit junit-bom - 5.10.0 + 5.10.1 pom import @@ -190,15 +190,21 @@ org.mockito mockito-bom - 5.5.0 + 5.7.0 import pom + + net.bytebuddy + byte-buddy + 1.14.9 + + io.swagger.core.v3 swagger-annotations-jakarta - 2.2.16 + 2.2.19 @@ -211,7 +217,7 @@ com.zaxxer HikariCP - 5.0.1 + 5.1.0 org.flywaydb @@ -273,7 +279,7 @@ org.apache.maven.plugins maven-clean-plugin - 3.3.1 + 3.3.2 org.apache.maven.plugins @@ -295,7 +301,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + 3.2.2 @{argLine} ${argLine} @@ -340,7 +346,7 @@ org.jacoco jacoco-maven-plugin - 0.8.10 + 0.8.11 prepare-agent @@ -382,7 +388,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 + 3.2.2 failsafe-integration-test