From a49ca20c300ffc8e20b4e644c82ec7eb6eff1c68 Mon Sep 17 00:00:00 2001
From: Vegard Skjefstad <vegard.skjefstad@nav.no>
Date: Mon, 1 Sep 2025 07:17:24 +0200
Subject: [PATCH] Oppgrader til Gradle 9 og fjern bruk av ShadowJar

---
 .dockerignore                            |  4 ++--
 .github/workflows/deploy.yaml            |  7 ++++---
 Dockerfile                               |  4 ++--
 dp-inntekt-api/build.gradle.kts          | 14 --------------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 settings.gradle.kts                      |  2 +-
 6 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 8f7fb008..085cc89d 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,5 @@
 # Ignore everything
 **
 
-# Except shadow jar
-!dp-inntekt-api/build/libs/dp-inntekt-api-all.jar
\ No newline at end of file
+# Except distribution
+!dp-inntekt-api/build/install/**
\ No newline at end of file
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index ae684382..acace435 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -21,8 +21,8 @@ jobs:
           distribution: temurin
           java-version: 21
 
-      - uses: gradle/wrapper-validation-action@v3.5.0
-      - uses: gradle/gradle-build-action@v3.5.0
+      - uses: gradle/actions/wrapper-validation@v4
+      - uses: gradle/actions/setup-gradle@v4
         id: build
         env:
           DEPENDENCY_GRAPH_INCLUDE_CONFIGURATIONS: compileClasspath|runtimeClasspath
@@ -30,7 +30,8 @@ jobs:
           ORG_GRADLE_PROJECT_githubPassword: ${{ secrets.GITHUB_TOKEN }}
         with:
           dependency-graph: generate-and-submit
-          arguments: --configuration-cache build
+          cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
+      - run: ./gradlew --configuration-cache build installDist
 
       - uses: nais/docker-build-push@v0
         name: docker-build-push
diff --git a/Dockerfile b/Dockerfile
index 2e7c61c7..a512ae96 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,6 @@ FROM gcr.io/distroless/java21
 
 ENV LANG='nb_NO.UTF-8' LANGUAGE='nb_NO:nb' LC_ALL='nb:NO.UTF-8' TZ="Europe/Oslo"
 
-COPY dp-inntekt-api/build/libs/dp-inntekt-api-all.jar app.jar
+COPY dp-inntekt-api/build/install/dp-inntekt-api/lib /app/lib
 
-ENTRYPOINT ["java", "-jar", "/app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java", "-cp", "/app/lib/*", "no.nav.dagpenger.inntekt.ApplicationKt"]
\ No newline at end of file
diff --git a/dp-inntekt-api/build.gradle.kts b/dp-inntekt-api/build.gradle.kts
index 623ab8a6..e3d4b104 100644
--- a/dp-inntekt-api/build.gradle.kts
+++ b/dp-inntekt-api/build.gradle.kts
@@ -1,11 +1,6 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
-
-
 plugins {
     id("common")
     application
-    alias(libs.plugins.shadow.jar)
     id("com.expediagroup.graphql") version "8.8.1"
     id("de.undercouch.download") version "5.6.0"
 }
@@ -89,10 +84,6 @@ dependencies {
     testImplementation("org.skyscreamer:jsonassert:1.5.3")
 }
 
-tasks.named("shadowJar") {
-    dependsOn("test")
-}
-
 tasks.named("compileKotlin") {
     dependsOn("graphqlGenerateClient")
 }
@@ -145,8 +136,3 @@ java {
     val graphqlDir = "$buildDir_/generated/source/graphql/main"
     mainJavaSourceSet.srcDirs(graphqlDir)
 }
-
-tasks.withType<ShadowJar> {
-    transform(Log4j2PluginsCacheFileTransformer::class.java)
-    mergeServiceFiles()
-}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37f853b1..2a84e188 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5f7e823d..4fbc0fd2 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -11,7 +11,7 @@ plugins {
  */
 
 rootProject.name = "dp-inntekt"
-include("dp-inntekt-api", "dp-inntekt-kontrakter", "openapi")
+include("dp-inntekt-api", "dp-inntekt-kontrakter")
 
 dependencyResolutionManagement {
     repositories {