From ff69b2bdb5455fd14043d4646b591ea4511ab3bb Mon Sep 17 00:00:00 2001
From: Jan Kroken <jan.kroken@nav.com>
Date: Mon, 4 Sep 2023 09:53:10 +0200
Subject: [PATCH] Retter java-versjon og la til permissions i workflows

---
 .github/workflows/deploy_dev_gcp.yml          |  5 +++-
 .../gradle-dependency-submission.yml          | 24 +++++++++++++++++++
 build.gradle.kts                              |  8 ++++++-
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/gradle-dependency-submission.yml

diff --git a/.github/workflows/deploy_dev_gcp.yml b/.github/workflows/deploy_dev_gcp.yml
index c88560f..9d1c407 100644
--- a/.github/workflows/deploy_dev_gcp.yml
+++ b/.github/workflows/deploy_dev_gcp.yml
@@ -8,6 +8,9 @@ jobs:
   tag_build_and_deploy:
     name: 'Build, deploy and tag'
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
     steps:
       # PULLER REPO
       - name: 'Pull repo'
@@ -50,4 +53,4 @@ jobs:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           RESOURCE: nais/dev-gcp.yml
           CLUSTER: dev-gcp
-          IMAGE: ${{ env.IMAGE_GHCR }}
\ No newline at end of file
+          IMAGE: ${{ env.IMAGE_GHCR }}
diff --git a/.github/workflows/gradle-dependency-submission.yml b/.github/workflows/gradle-dependency-submission.yml
new file mode 100644
index 0000000..1171d5d
--- /dev/null
+++ b/.github/workflows/gradle-dependency-submission.yml
@@ -0,0 +1,24 @@
+name: Monitor dependencies with Dependabot
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "**.gradle.kts"
+      - "gradle.properties"
+  workflow_dispatch:
+jobs:
+  dependabot:
+    name: Monitor dependencies with Dependabot
+    runs-on: ubuntu-20.04
+    permissions: # The Dependency Submission API requires write permission
+      contents: write
+    steps:
+      - uses: actions/checkout@v3 # ratchet:actions/checkout@v3
+      - name: Run snapshot action
+        uses: mikepenz/gradle-dependency-submission@v0.8.6
+        with:
+          fail-on-error: true
+          gradle-dependency-path: "build.gradle.kts"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 3454c07..c8cb8f7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,6 +24,12 @@ apply(plugin = "io.spring.dependency-management")
 group = "no.nav.pensjon.opptjening"
 java.sourceCompatibility = JavaVersion.VERSION_17
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
 repositories {
     mavenLocal()
     mavenCentral()
@@ -84,4 +90,4 @@ tasks.withType<Test> {
             TestLogEvent.SKIPPED
         )
     }
-}
\ No newline at end of file
+}