Skip to content

Commit

Permalink
Merge pull request #392 from navikt/jdk21
Browse files Browse the repository at this point in the history
Oppdaterer java versjon
  • Loading branch information
throndi authored Dec 18, 2023
2 parents aece573 + f24e241 commit 8125745
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ jobs:
with:
persist-credentials: false
fetch-depth: 0 # brukes for å unngå feil i differ i sonar
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
cache: 'maven'
- name: Bygg (dependabot)
if: github.actor == 'dependabot[bot]'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
- uses: actions/checkout@v4
with:
persist-credentials: false
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
cache: 'maven'
- name: Bygg med Maven
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ jobs:
- uses: actions/checkout@v4
with:
persist-credentials: false
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
cache: 'maven'
- name: Bygg med Maven
env:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/navikt/baseimages/temurin:17
FROM ghcr.io/navikt/baseimages/temurin:21

ENV APP_NAME=familie-klage
ENV JAVA_OPTS="-XX:MaxRAMPercentage=75"
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
<revision>1.0</revision>
<sha1/>
<changelist>-SNAPSHOT</changelist>
<java.version>17</java.version>
<kotlin.version>1.9.20</kotlin.version>
<java.version>21</java.version>
<kotlin.version>1.9.21</kotlin.version>
<springdoc.version>2.2.0</springdoc.version>
<mockk-jvm.version>1.13.8</mockk-jvm.version>
<felles.version>2.20231023162434_fa320ce</felles.version>
Expand Down

0 comments on commit 8125745

Please sign in to comment.