Merge branch 'main' into ktlint1.1.1

navikt · Jan 25, 2024 · 732fd1e · 732fd1e
2 parents 52ec559 + 660f2d2
commit 732fd1e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build-and-deploy-preprod.yml b/.github/workflows/build-and-deploy-preprod.yml
@@ -17,9 +17,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - name: Bygg med maven + sonar

diff --git a/.github/workflows/build-and-deploy-prod.yml b/.github/workflows/build-and-deploy-prod.yml
@@ -16,9 +16,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - name: Bygg med maven

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -71,7 +71,7 @@ jobs:
         env:
           GITHUB_USERNAME: x-access-token
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: mvn -B --no-transfer-progress package --settings .m2/maven-settings.xml -DtrimStackTrace=false --file pom.xml -Dchangelist= -Dsha1=-$TIMESTAMP-$(echo $GITHUB_SHA | cut -c1-7)
+        run: mvn -B --no-transfer-progress compile --settings .m2/maven-settings.xml
 
 
       # ℹ️ Command-line programs to run using the OS shell.

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
 ENV APP_NAME=familie-oppdrag

diff --git a/pom.xml b/pom.xml
@@ -18,8 +18,8 @@
         <revision>1.0</revision>
         <sha1/>
         <changelist>-SNAPSHOT</changelist>
-        <jvmTarget>17</jvmTarget>
-        <kotlin.version>1.9.0</kotlin.version>
+        <jvmTarget>21</jvmTarget>
+        <kotlin.version>1.9.22</kotlin.version>
         <main-class>no.nav.familie.oppdrag.LauncherKt</main-class>
         <felles.version>2.20230508082643_6b28bd8</felles.version>
         <kontrakter.version>3.0_20240122110213_5591a29</kontrakter.version>