From ec0a27bd15931ec0c0351bd2fc908d03e25549ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 23:30:24 +0000 Subject: [PATCH 01/22] Bump springdoc.version from 2.1.0 to 2.2.0 Bumps `springdoc.version` from 2.1.0 to 2.2.0. Updates `org.springdoc:springdoc-openapi-starter-common` from 2.1.0 to 2.2.0 - [Release notes](https://github.com/springdoc/springdoc-openapi/releases) - [Changelog](https://github.com/springdoc/springdoc-openapi/blob/main/CHANGELOG.md) - [Commits](https://github.com/springdoc/springdoc-openapi/compare/v2.1.0...v2.2.0) Updates `org.springdoc:springdoc-openapi-starter-webmvc-ui` from 2.1.0 to 2.2.0 - [Release notes](https://github.com/springdoc/springdoc-openapi/releases) - [Changelog](https://github.com/springdoc/springdoc-openapi/blob/main/CHANGELOG.md) - [Commits](https://github.com/springdoc/springdoc-openapi/compare/v2.1.0...v2.2.0) --- updated-dependencies: - dependency-name: org.springdoc:springdoc-openapi-starter-common dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springdoc:springdoc-openapi-starter-webmvc-ui dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 359192b0..b0fb1b4c 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ https://sonarcloud.io navikt_aap-soknad-api 4.7.1 - 2.1.0 + 2.2.0 2.2.15 1.18.3 2.8.0 From a11520316396f028ceba33871a48f3b6d7725aa5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 23:51:50 +0000 Subject: [PATCH 02/22] Bump pdfbox.version from 2.0.29 to 3.0.0 Bumps `pdfbox.version` from 2.0.29 to 3.0.0. Updates `org.apache.pdfbox:pdfbox` from 2.0.29 to 3.0.0 Updates `org.apache.pdfbox:preflight` from 2.0.29 to 3.0.0 --- updated-dependencies: - dependency-name: org.apache.pdfbox:pdfbox dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.apache.pdfbox:preflight dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 359192b0..e708e72d 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 1.9.0 7.4 4.9.1 - 2.0.29 + 3.0.0 1.0.1.RELEASE 0.0.1-SNAPSHOT navikt From 847e56d9ae1491ad88af8c5d11e7a261267e2dcf Mon Sep 17 00:00:00 2001 From: Sturle Helland Date: Mon, 28 Aug 2023 10:13:02 +0200 Subject: [PATCH 03/22] dependabot --- src/main/kotlin/no/nav/aap/api/error/Substatus.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 4da4d0da..1ee6d125 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 +} + From ee95732318936510d9a702433f4a70fe14c2b119 Mon Sep 17 00:00:00 2001 From: Sturle Helland Date: Mon, 28 Aug 2023 10:46:16 +0200 Subject: [PATCH 04/22] bumpet google-cloud-bom --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c99a2f79..ce6bc3b6 100644 --- a/pom.xml +++ b/pom.xml @@ -22,14 +22,14 @@ 2.0.79 08271806 26.21.0 - 0.202.0 + 0.203.0 1.29 17 3.3.2 1.9.0 7.4 4.9.1 - 3.0.0 + 2.0.29 1.0.1.RELEASE 0.0.1-SNAPSHOT navikt From 200916179ed796b77a11911202fccb1e7758985d Mon Sep 17 00:00:00 2001 From: Sturle Helland Date: Mon, 28 Aug 2023 10:49:50 +0200 Subject: [PATCH 05/22] bumpet google-cloud-libraries --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce6bc3b6..0ec4ac3a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 1.10.0 2.0.79 08271806 - 26.21.0 + 26.22.0 0.203.0 1.29 17 From c7d4962b3a6542945c0d6e91fb0fa41ac25d38b8 Mon Sep 17 00:00:00 2001 From: Sturle Helland Date: Mon, 28 Aug 2023 10:59:20 +0200 Subject: [PATCH 06/22] bumpet kafka --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0ec4ac3a..391639d1 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.11.2 2.5.2 - 7.4.1 + 7.5.0 1.10.0 2.0.79 08271806 @@ -35,7 +35,7 @@ navikt https://sonarcloud.io navikt_aap-soknad-api - 4.7.1 + 4.7.2 2.2.0 2.2.15 1.18.3 From df59671828a2694a3b8dbf30655ae403141ca6c4 Mon Sep 17 00:00:00 2001 From: Sturle Helland Date: Mon, 28 Aug 2023 11:03:29 +0200 Subject: [PATCH 07/22] bumpet boot --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 391639d1..c73019cf 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.2 + 3.1.3 From 3cf616683d74aefcba2b150ef3137a6559f3205e Mon Sep 17 00:00:00 2001 From: Sturle Helland Date: Mon, 28 Aug 2023 11:16:50 +0200 Subject: [PATCH 08/22] bumpet testcontainers --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c73019cf..a0205faf 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 1.29 17 3.3.2 - 1.9.0 + 1.9.10 7.4 4.9.1 2.0.29 @@ -38,7 +38,7 @@ 4.7.2 2.2.0 2.2.15 - 1.18.3 + 1.19.0 2.8.0 3.1.0 20230203100430-ecf5208 From 7af8ce4e2135d4794e4cc06c7d7837aedc622d06 Mon Sep 17 00:00:00 2001 From: Sturle Helland Date: Wed, 18 Oct 2023 14:58:23 +0200 Subject: [PATCH 09/22] Bump com.google.cloud:google-cloud-bom from 0.202.0 to 0.206.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 359192b0..59021aa9 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 2.0.79 08271806 26.21.0 - 0.202.0 + 0.206.0 1.29 17 3.3.2 From 400b3a6b999d1dd28478406761e92e58a3b653a9 Mon Sep 17 00:00:00 2001 From: Sturle Helland Date: Wed, 18 Oct 2023 14:58:56 +0200 Subject: [PATCH 10/22] Fjernet ubrukt import --- .../api/s\303\270knad/fordeling/S\303\270knadVLFordeler.kt" | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 99c6283a..49ded562 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) From 3a35f61fac5d4bb96f489504d7316fb2e25099f7 Mon Sep 17 00:00:00 2001 From: Sturle Helland Date: Wed, 18 Oct 2023 15:14:53 +0200 Subject: [PATCH 11/22] Bump com.google.cloud:spring-cloud-gcp-dependencies from 4.7.1 to 4.8.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 59021aa9..8cca3a23 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ navikt https://sonarcloud.io navikt_aap-soknad-api - 4.7.1 + 4.8.2 2.1.0 2.2.15 1.18.3 From 118cdcfc2ffaa588086bbfcd61fc03c7f4616807 Mon Sep 17 00:00:00 2001 From: Sturle Helland Date: Wed, 18 Oct 2023 15:22:08 +0200 Subject: [PATCH 12/22] Bump com.google.cloud:libraries-bom from 26.21.0 to 26.25.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8cca3a23..d725de9e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 1.10.0 2.0.79 08271806 - 26.21.0 + 26.25.0 0.206.0 1.29 17 From a2c3fba708b55634a3aa687ff7b3e6b6729d3dd1 Mon Sep 17 00:00:00 2001 From: Sturle Helland Date: Wed, 18 Oct 2023 15:24:45 +0200 Subject: [PATCH 13/22] Bump io.swagger.core.v3:swagger-annotations from 2.2.15 to 2.2.17 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d725de9e..0eb45f9f 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ navikt_aap-soknad-api 4.8.2 2.1.0 - 2.2.15 + 2.2.17 1.18.3 2.8.0 3.1.0 From da39bf63853b49955447a7d41f88067c8a26ef25 Mon Sep 17 00:00:00 2001 From: Sturle Helland Date: Wed, 18 Oct 2023 15:34:36 +0200 Subject: [PATCH 14/22] Bump io.micrometer:context-propagation from 1.0.4 to 1.0.6 --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0eb45f9f..011277ab 100644 --- a/pom.xml +++ b/pom.xml @@ -42,6 +42,7 @@ 2.8.0 3.1.0 20230203100430-ecf5208 + 1.0.6 @@ -222,7 +223,7 @@ io.micrometer context-propagation - 1.0.4 + ${io.micrometer.version} com.squareup.okhttp3 From 27e5b3f4b7fbf1000754914088a70f04c3629ef6 Mon Sep 17 00:00:00 2001 From: Sturle Helland Date: Wed, 18 Oct 2023 15:36:47 +0200 Subject: [PATCH 15/22] Bump org.apache.avro:avro from 1.11.2 to 1.11.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 011277ab..b2ab6bbc 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ aap-soknad-api aap-soknad-api - 1.11.2 + 1.11.3 2.5.2 7.4.1 1.10.0 From 0c45953172a78deb71f72b3be166775b1e5662bc Mon Sep 17 00:00:00 2001 From: Sturle Helland Date: Wed, 18 Oct 2023 15:38:45 +0200 Subject: [PATCH 16/22] Bump com.google.cloud.tools:jib-maven-plugin from 3.3.2 to 3.4.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b2ab6bbc..0e4860ee 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 0.206.0 1.29 17 - 3.3.2 + 3.4.0 1.9.0 7.4 4.9.1 From 6fcff73148dbde8cf540345e667cf07a192620ae Mon Sep 17 00:00:00 2001 From: Sturle Helland Date: Wed, 18 Oct 2023 15:45:29 +0200 Subject: [PATCH 17/22] Bump org.springframework.boot:spring-boot-starter-parent from 3.1.2 to 3.1.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0e4860ee..4ce0b93f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.2 + 3.1.4 From 52a5a6b45ed316958324c8d97e4fa6ba61a1b5ea Mon Sep 17 00:00:00 2001 From: Sturle Helland Date: Wed, 18 Oct 2023 15:46:53 +0200 Subject: [PATCH 18/22] Bump org.apache.tika:tika-core from 2.8.0 to 2.9.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4ce0b93f..99769c52 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 2.1.0 2.2.17 1.18.3 - 2.8.0 + 2.9.0 3.1.0 20230203100430-ecf5208 1.0.6 From b7df2c3215657b174a948db54b130444dc2f0ebb Mon Sep 17 00:00:00 2001 From: Sturle Helland Date: Thu, 19 Oct 2023 10:19:44 +0200 Subject: [PATCH 19/22] =?UTF-8?q?Monitor=20dependencies=20with=20Dependabo?= =?UTF-8?q?t=20yml=20lagt=20til=20for=20=C3=A5=20fikse=20dependaboot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Vetle Hollund Co-authored-by: Richard Borge --- .github/workflows/dependencies.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/dependencies.yml diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml new file mode 100644 index 00000000..4ccd0d3e --- /dev/null +++ b/.github/workflows/dependencies.yml @@ -0,0 +1,18 @@ +name: Monitor dependencies with Dependabot +on: + push: + branches: + - main + paths: + - "pom.xml" + 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@v4 + - name: Submit Dependency Snapshot + uses: advanced-security/maven-dependency-submission-action@v4 \ No newline at end of file From 2c881f69bbe33764db3f47eeb6e4f78f91afbad3 Mon Sep 17 00:00:00 2001 From: Sturle Helland Date: Thu, 19 Oct 2023 10:44:41 +0200 Subject: [PATCH 20/22] :arrow_up: merget inn master Co-authored-by: Vetle Hollund Co-authored-by: Richard Borge --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 359192b0..48106129 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 26.21.0 0.202.0 1.29 - 17 + 20 3.3.2 1.9.0 7.4 From 12516ebfb67b25453a2528d896c9282b88a9cc20 Mon Sep 17 00:00:00 2001 From: Sturle Helland Date: Mon, 13 Nov 2023 13:31:04 +0100 Subject: [PATCH 21/22] =?UTF-8?q?:arrow=5Fdown:=20nedgradert=20java=20til?= =?UTF-8?q?=2017=20siden=20google=20venter=20p=C3=A5=20v21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Vetle Hollund Co-authored-by: Robin Tordly --- .github/workflows/build-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 196acec0..67674d13 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 From bddf7323e9bbbfb4f0390993e0b9b8750e343ff2 Mon Sep 17 00:00:00 2001 From: Sturle Helland Date: Mon, 13 Nov 2023 13:53:36 +0100 Subject: [PATCH 22/22] Fjernet deploy fra pr --- .github/workflows/build-pr.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 67674d13..af1fa26d 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -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