diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index 196acec0c..af1fa26d9 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -26,10 +26,10 @@ jobs:
uses: actions/checkout@v4.1.1
- - name: Setter opp Java 20
+ - name: Setter opp Java 17
uses: actions/setup-java@v3.13.0
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
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index dea4a5d0e..f4e0172b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.1.2
+ 3.1.3
@@ -17,16 +17,16 @@
1.11.2
2.5.2
- 7.4.1
+ 7.5.0
1.10.0
2.0.79
08271806
- 26.21.0
- 0.202.0
+ 26.22.0
+ 0.203.0
1.29
17
3.3.2
- 1.9.0
+ 1.9.10
7.4
4.9.1
2.0.29
@@ -35,10 +35,10 @@
navikt
https://sonarcloud.io
navikt_aap-soknad-api
- 4.7.1
- 2.1.0
+ 4.7.2
+ 2.2.0
2.2.15
- 1.18.3
+ 1.19.0
2.8.0
3.1.0
20230203100430-ecf5208
diff --git a/src/main/kotlin/no/nav/aap/api/error/Substatus.kt b/src/main/kotlin/no/nav/aap/api/error/Substatus.kt
index 4da4d0dab..1ee6d125e 100644
--- 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,
-}
\ No newline at end of file
+}
+
diff --git "a/src/main/kotlin/no/nav/aap/api/s\303\270knad/fordeling/S\303\270knadVLFordeler.kt" "b/src/main/kotlin/no/nav/aap/api/s\303\270knad/fordeling/S\303\270knadVLFordeler.kt"
index 99c6283a0..49ded5628 100644
--- "a/src/main/kotlin/no/nav/aap/api/s\303\270knad/fordeling/S\303\270knadVLFordeler.kt"
+++ "b/src/main/kotlin/no/nav/aap/api/s\303\270knad/fordeling/S\303\270knadVLFordeler.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) {
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)