Oppgrader til Java 21

navikt · May 7, 2024 · 0227b81 · 0227b81
1 parent a0a38b6
commit 0227b81
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/build-deploy-feature-branch-dev.yaml b/.github/workflows/build-deploy-feature-branch-dev.yaml
@@ -20,10 +20,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up Java 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -53,7 +53,7 @@ jobs:
     - name: Setup Java
       uses: actions/setup-java@v4
       with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
           cache: maven
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,10 +15,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 
@@ -39,10 +39,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,2 +1,2 @@
-FROM ghcr.io/navikt/poao-baseimages/java:17
+FROM ghcr.io/navikt/baseimages/temurin:21
 COPY /target/veilarbfilter.jar app.jar
diff --git a/pom.xml b/pom.xml
@@ -15,16 +15,16 @@
     <version>1</version>
 
     <properties>
-        <java.version>17</java.version>
-        <common.version>3.2023.10.23_12.41-bafec3836d28</common.version>
+        <java.version>21</java.version>
+        <common.version>3.2024.04.22_13.50-7815154a2573</common.version>
         <confluent.version>5.5.1</confluent.version>
         <avro.version>1.11.0</avro.version>
         <testcontainers.version>1.19.7</testcontainers.version>
         <junit.jupiter.version>5.10.2</junit.jupiter.version>
 
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <maven.compiler.release>17</maven.compiler.release>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.release>21</maven.compiler.release>
     </properties>
 
     <build>
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.28</version>
+            <version>1.18.32</version>
         </dependency>
 
         <!-- Common -->