Merge pull request #667 from navikt/dependabot-10-23

Dependabot 10 23
navikt · Nov 13, 2023 · 7fc9332 · 7fc9332
2 parents 76bf443 + bddf732
commit 7fc9332
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 29 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -26,10 +26,10 @@ jobs:
                 uses: actions/[email protected]
 
 
-            -   name: Setter opp Java 20
+            -   name: Setter opp Java 17
                 uses: actions/[email protected]
                 with:
-                    java-version: 20
+                    java-version: 17
                     distribution: temurin
                     cache: maven
 
@@ -51,19 +51,3 @@ jobs:
                 run: |
                     echo "image=${{ env.IMAGE }}" >> $GITHUB_OUTPUT
                     ./mvnw  --batch-mode --settings .github/.m2/settings.xml  -DGAR_TOKEN=${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} package jib:build 
-
-    deploy:
-        name: Deploy PR til dev-gcp
-        needs: bygg
-        runs-on: ubuntu-latest
-        environment: pr:dev-gcp:aap
-        env:
-            PRINT_PAYLOAD: true
-            APIKEY: ${{secrets.NAIS_DEPLOY_APIKEY}}
-            RESOURCE: .nais/naiserator.yaml,.nais/dev-gcp-alerts.yaml
-            CLUSTER: dev-gcp
-            VARS: .nais/dev-gcp.json
-            IMAGE: ${{needs.bygg.outputs.image}}
-        steps:
-            -   uses: actions/checkout@v3
-            -   uses: nais/deploy/actions/deploy@master
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3</version>
         <relativePath/>
     </parent>
 
@@ -17,16 +17,16 @@
     <properties>
         <avro.version>1.11.2</avro.version>
         <brukernotifikasjoner.version>2.5.2</brukernotifikasjoner.version>
-        <confluent.version>7.4.1</confluent.version>
+        <confluent.version>7.5.0</confluent.version>
         <commons-text.version>1.10.0</commons-text.version>
         <domain.version>2.0.79</domain.version>
         <eksternvarsling.version>08271806</eksternvarsling.version>
-        <gcp.libraries.version>26.21.0</gcp.libraries.version>
-        <gcp.version>0.202.0</gcp.version>
+        <gcp.libraries.version>26.22.0</gcp.libraries.version>
+        <gcp.version>0.203.0</gcp.version>
         <i18n.version>1.29</i18n.version>
         <java.version>17</java.version>
         <jib.version>3.3.2</jib.version>
-        <kotlin.version>1.9.0</kotlin.version>
+        <kotlin.version>1.9.10</kotlin.version>
         <logstash.version>7.4</logstash.version>
         <okhttp3.version>4.9.1</okhttp3.version>
         <pdfbox.version>2.0.29</pdfbox.version>
@@ -35,10 +35,10 @@
         <sonar.organization>navikt</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <sonar.projectKey>navikt_aap-soknad-api</sonar.projectKey>
-        <spring-cloud-gcp.version>4.7.1</spring-cloud-gcp.version>
-        <springdoc.version>2.1.0</springdoc.version>
+        <spring-cloud-gcp.version>4.7.2</spring-cloud-gcp.version>
+        <springdoc.version>2.2.0</springdoc.version>
         <swagger.annotations.version>2.2.15</swagger.annotations.version>
-        <testcontainers.version>1.18.3</testcontainers.version>
+        <testcontainers.version>1.19.0</testcontainers.version>
         <tika.version>2.8.0</tika.version>
         <token.validation.version>3.1.0</token.validation.version>
         <utkast.version>20230203100430-ecf5208</utkast.version>

diff --git a/src/main/kotlin/no/nav/aap/api/error/Substatus.kt b/src/main/kotlin/no/nav/aap/api/error/Substatus.kt
@@ -5,4 +5,5 @@ enum class Substatus {
     VIRUS,
     SIZE,
     UNSUPPORTED,
-}
+}
+
diff --git a/src/main/kotlin/no/nav/aap/api/søknad/fordeling/SøknadVLFordeler.kt b/src/main/kotlin/no/nav/aap/api/søknad/fordeling/SøknadVLFordeler.kt
@@ -4,7 +4,6 @@ import org.apache.kafka.clients.producer.ProducerRecord
 import org.springframework.kafka.core.KafkaOperations
 import org.springframework.stereotype.Component
 import no.nav.aap.api.felles.Fødselsnummer
-import no.nav.aap.api.søknad.fordeling.VLFordelingConfig.VLTopicConfig
 import no.nav.aap.util.LoggerUtil.getLogger
 import no.nav.aap.util.MDCUtil.NAV_CALL_ID
 import no.nav.aap.util.MDCUtil.callId
@@ -14,7 +13,7 @@ class SøknadVLFordeler(private val fordeler: KafkaOperations<String, Any>) {
 
     private val log = getLogger(javaClass)
 
-    fun fordel(søknad: Any, fnr: Fødselsnummer, journalpostId: String, cfg: VLTopicConfig) =
+    fun fordel(søknad: Any, fnr: Fødselsnummer, journalpostId: String, cfg: VLFordelingConfig.VLTopicConfig) =
         if (cfg.enabled) {
             with(cfg) {
                 fordeler.send(ProducerRecord(topic, fnr.fnr, søknad)
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,5 @@ enum class Substatus { @@
         VIRUS,
         SIZE,
         UNSUPPORTED,
-    }
+    }