Bytte til java21 (#2024)

* Update Dockerfile * Update build-master.yaml * Update build-pull-request.yaml * Update deploy-preprod.yml * Update build.gradle.kts
navikt · Apr 15, 2024 · ffee3bc · ffee3bc
1 parent 9c5db80
commit ffee3bc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build-master.yaml b/.github/workflows/build-master.yaml
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
           cache: gradle
 

diff --git a/.github/workflows/build-pull-request.yaml b/.github/workflows/build-pull-request.yaml
@@ -22,10 +22,10 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
           cache: gradle
       - name: Kjør tester & bygg JAR
         run: ./gradlew clean test shadowjar
         env:
-          GITHUB_TOKEN: ${{ secrets.READER_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.READER_TOKEN }}
diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
           cache: gradle
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/navikt/baseimages/temurin:17-appdynamics
+FROM ghcr.io/navikt/baseimages/temurin:21-appdynamics
 ENV APPD_ENABLED=true
 LABEL org.opencontainers.image.source=https://github.com/navikt/k9-los-api
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -120,7 +120,7 @@ repositories {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -120,7 +120,7 @@ repositories { @@
     java {
         toolchain {
-            languageVersion.set(JavaLanguageVersion.of(17))
+            languageVersion.set(JavaLanguageVersion.of(21))
         }
     }
@@ Expand Down @@