Legg til jar task for fritekstAvslag

Author: hestad

client/build.gradle.kts

@@ -35,12 +35,15 @@ dependencies {
     implementation(rootProject.libs.cxf.rt.ws.security) {
         // https://security.snyk.io/vuln/SNYK-JAVA-ORGAPACHEVELOCITY-3116414
         exclude(group = "org.apache.velocity")
+        exclude(group = "org.bouncycastle", module = "bcprov-jdk15on")
     }
     implementation("javax.xml.ws:jaxws-api:2.3.1")
     implementation("javax.jws:javax.jws-api:1.1")
     // Fails to find SAAJMetaFactoryImpl when either missing or if you upgrade to 2.0.0
     implementation("com.sun.xml.messaging.saaj:saaj-impl:1.5.2")
     implementation("com.nimbusds:nimbus-jose-jwt:9.37.3")
+    // We exclude jdk15on because of security issues. We use jdk18on instead.
+    implementation("org.bouncycastle:bcprov-jdk18on:1.77")
 
     testImplementation(project(":test-common"))
     implementation(rootProject.libs.wiremock) {
@@ -63,3 +66,11 @@ configure<SourceSetContainer> {
         java.srcDir(wsdl2javaDir.map { it.asFile })
     }
 }
+
+configurations {
+    all {
+        // Ref dependabot PR 8 - https://github.com/navikt/su-se-bakover/security/dependabot/1 https://github.com/advisories/GHSA-6xx3-rg99-gc3p https://github.com/navikt/su-se-bakover/security/dependabot/8 https://github.com/advisories/GHSA-hr8g-6v94-x4m9
+        // We exclude this and include jdk18on instead.
+        exclude(group = "org.bouncycastle", module = "bcprov-jdk15on")
+    }
+}

common/infrastructure/cxf/build.gradle.kts

@@ -8,9 +8,20 @@ dependencies {
     implementation(rootProject.libs.cxf.rt.ws.security) {
         // https://security.snyk.io/vuln/SNYK-JAVA-ORGAPACHEVELOCITY-3116414
         exclude(group = "org.apache.velocity")
+        exclude(group = "org.bouncycastle", module = "bcprov-jdk15on")
     }
+    // We exclude jdk15on because of security issues. We use jdk18on instead.
+    implementation("org.bouncycastle:bcprov-jdk18on:1.77")
 }
 
 tasks.named<Jar>("jar") {
     archiveBaseName.set("common-infrastructure-cxf")
 }
+
+configurations {
+    all {
+        // Ref dependabot PR 8 - https://github.com/navikt/su-se-bakover/security/dependabot/1 https://github.com/advisories/GHSA-6xx3-rg99-gc3p https://github.com/navikt/su-se-bakover/security/dependabot/8 https://github.com/advisories/GHSA-hr8g-6v94-x4m9
+        // We exclude this and include jdk18on instead.
+        exclude(group = "org.bouncycastle", module = "bcprov-jdk15on")
+    }
+}

datapakker/README.md

@@ -50,6 +50,7 @@ Hovedpoenget med en datapakke er å hente fram data, og lagre det i en BigQuery
 3. konfigurer GCP/BigQuery
 4. Lag en nais.yml & dockerfile for å kjøre jobben i nais
 5. Husk å oppdatere '.github/workflows/datapakker.yml'. Per nå dupliserer vi litt mye, så du kan gjerne gjøre noe smart istedenfor :)
+6. Kopier build.gradle.kts i sin helhet og endre på navn og dependencies. jar-tasken er viktig, da den bygger en jar-fil som støttes av baseimages.
 
 #### GCP
 1. Gå til `console.cloud.google.com`

datapakker/fritekstAvslag/build.gradle.kts

@@ -1,3 +1,24 @@
+tasks.named<Jar>("jar") {
+    archiveBaseName.set("app")
+    archiveVersion.set("")
+    manifest {
+        attributes["Main-Class"] = "no.nav.su.se.bakover.datapakker.fritekstAvslag.AppKt"
+        attributes["Class-Path"] =
+            configurations.runtimeClasspath.get().joinToString(separator = " ") {
+                it.name
+            }
+    }
+    doLast {
+        configurations.runtimeClasspath.get().forEach {
+            val fileProvider: Provider<RegularFile> = layout.buildDirectory.file("libs/${it.name}")
+            val targetFile = File(fileProvider.get().toString())
+            if (!targetFile.exists()) {
+                it.copyTo(targetFile)
+            }
+        }
+    }
+}
+
 dependencies {
     implementation(platform("com.google.cloud:libraries-bom:26.34.0"))
     implementation("com.google.cloud:google-cloud-bigquery")

tilbakekreving/infrastructure/build.gradle.kts

@@ -22,10 +22,13 @@ dependencies {
     implementation(rootProject.libs.cxf.rt.ws.security) {
         // https://security.snyk.io/vuln/SNYK-JAVA-ORGAPACHEVELOCITY-3116414
         exclude(group = "org.apache.velocity")
+        exclude(group = "org.bouncycastle", module = "bcprov-jdk15on")
     }
 
     testImplementation(project(":test-common"))
     testImplementation(project(":satser"))
+    // We exclude jdk15on because of security issues. We use jdk18on instead.
+    implementation("org.bouncycastle:bcprov-jdk18on:1.77")
 }
 
 tasks.named<Jar>("jar") {