From 44e88af87fadb592a9e39b977698a05c184d01d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 08:18:41 +0000 Subject: [PATCH 1/3] Bump the all-minor-patch group with 28 updates Bumps the all-minor-patch group with 28 updates: | Package | From | To | | --- | --- | --- | | [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) | `3.3.4` | `3.3.5` | | [org.cyclonedx:cyclonedx-maven-plugin](https://github.com/CycloneDX/cyclonedx-maven-plugin) | `2.8.2` | `2.9.0` | | [org.jetbrains.kotlin:kotlin-stdlib](https://github.com/JetBrains/kotlin) | `2.0.20` | `2.0.21` | | org.jetbrains.kotlin:kotlin-maven-plugin | `2.0.20` | `2.0.21` | | org.jetbrains.kotlin:kotlin-maven-allopen | `2.0.20` | `2.0.21` | | org.jetbrains.kotlin:kotlin-maven-serialization | `2.0.20` | `2.0.21` | | [com.fasterxml.jackson.module:jackson-module-kotlin](https://github.com/FasterXML/jackson-module-kotlin) | `2.17.2` | `2.18.1` | | org.openapitools:openapi-generator-maven-plugin | `7.8.0` | `7.9.0` | | [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) | `3.5.0` | `3.5.1` | | [org.springframework.boot:spring-boot-starter-web](https://github.com/spring-projects/spring-boot) | `3.3.4` | `3.3.5` | | [org.springframework.boot:spring-boot-starter-actuator](https://github.com/spring-projects/spring-boot) | `3.3.4` | `3.3.5` | | [org.springframework.boot:spring-boot-starter-security](https://github.com/spring-projects/spring-boot) | `3.3.4` | `3.3.5` | | [org.springframework.boot:spring-boot-starter-validation](https://github.com/spring-projects/spring-boot) | `3.3.4` | `3.3.5` | | [org.springframework.boot:spring-boot-starter-test](https://github.com/spring-projects/spring-boot) | `3.3.4` | `3.3.5` | | [org.testcontainers:junit-jupiter](https://github.com/testcontainers/testcontainers-java) | `1.20.2` | `1.20.3` | | [org.testcontainers:kafka](https://github.com/testcontainers/testcontainers-java) | `1.20.2` | `1.20.3` | | [io.prometheus:prometheus-metrics-instrumentation-jvm](https://github.com/prometheus/client_java) | `1.3.1` | `1.3.2` | | [com.expediagroup:graphql-kotlin-spring-client](https://github.com/ExpediaGroup/graphql-kotlin) | `8.0.0` | `8.2.1` | | [com.expediagroup:graphql-kotlin-maven-plugin](https://github.com/ExpediaGroup/graphql-kotlin) | `8.0.0` | `8.2.1` | | org.apache.kafka:kafka-streams | `3.8.0` | `3.8.1` | | org.apache.kafka:kafka-clients | `3.8.0` | `3.8.1` | | org.apache.kafka:kafka-streams-test-utils | `3.8.0` | `3.8.1` | | [no.nav.security:token-validation-spring](https://github.com/navikt/token-support) | `5.0.5` | `5.0.8` | | [no.nav.security:token-client-spring](https://github.com/navikt/token-support) | `5.0.5` | `5.0.8` | | [io.mockk:mockk](https://github.com/mockk/mockk) | `1.13.12` | `1.13.13` | | [io.mockk:mockk-jvm](https://github.com/mockk/mockk) | `1.13.12` | `1.13.13` | | [org.springframework:spring-web](https://github.com/spring-projects/spring-framework) | `6.1.13` | `6.1.14` | | io.swagger.core.v3:swagger-annotations | `2.2.24` | `2.2.25` | Updates `org.springframework.boot:spring-boot-starter-parent` from 3.3.4 to 3.3.5 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.4...v3.3.5) Updates `org.cyclonedx:cyclonedx-maven-plugin` from 2.8.2 to 2.9.0 - [Release notes](https://github.com/CycloneDX/cyclonedx-maven-plugin/releases) - [Commits](https://github.com/CycloneDX/cyclonedx-maven-plugin/compare/cyclonedx-maven-plugin-2.8.2...cyclonedx-maven-plugin-2.9.0) Updates `org.jetbrains.kotlin:kotlin-stdlib` from 2.0.20 to 2.0.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.20...v2.0.21) Updates `org.jetbrains.kotlin:kotlin-maven-plugin` from 2.0.20 to 2.0.21 Updates `org.jetbrains.kotlin:kotlin-maven-allopen` from 2.0.20 to 2.0.21 Updates `org.jetbrains.kotlin:kotlin-maven-serialization` from 2.0.20 to 2.0.21 Updates `com.fasterxml.jackson.module:jackson-module-kotlin` from 2.17.2 to 2.18.1 - [Commits](https://github.com/FasterXML/jackson-module-kotlin/compare/jackson-module-kotlin-2.17.2...jackson-module-kotlin-2.18.1) Updates `org.openapitools:openapi-generator-maven-plugin` from 7.8.0 to 7.9.0 Updates `org.jetbrains.kotlin:kotlin-maven-plugin` from 2.0.20 to 2.0.21 Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.5.0 to 3.5.1 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.0...surefire-3.5.1) Updates `org.springframework.boot:spring-boot-starter-web` from 3.3.4 to 3.3.5 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.4...v3.3.5) Updates `org.springframework.boot:spring-boot-starter-actuator` from 3.3.4 to 3.3.5 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.4...v3.3.5) Updates `org.springframework.boot:spring-boot-starter-security` from 3.3.4 to 3.3.5 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.4...v3.3.5) Updates `org.springframework.boot:spring-boot-starter-validation` from 3.3.4 to 3.3.5 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.4...v3.3.5) Updates `org.springframework.boot:spring-boot-starter-test` from 3.3.4 to 3.3.5 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.4...v3.3.5) Updates `org.springframework.boot:spring-boot-starter-actuator` from 3.3.4 to 3.3.5 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.4...v3.3.5) Updates `org.springframework.boot:spring-boot-starter-security` from 3.3.4 to 3.3.5 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.4...v3.3.5) Updates `org.testcontainers:junit-jupiter` from 1.20.2 to 1.20.3 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.20.2...1.20.3) Updates `org.testcontainers:kafka` from 1.20.2 to 1.20.3 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.20.2...1.20.3) Updates `org.springframework.boot:spring-boot-starter-validation` from 3.3.4 to 3.3.5 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.4...v3.3.5) Updates `io.prometheus:prometheus-metrics-instrumentation-jvm` from 1.3.1 to 1.3.2 - [Release notes](https://github.com/prometheus/client_java/releases) - [Commits](https://github.com/prometheus/client_java/compare/v1.3.1...v1.3.2) Updates `com.expediagroup:graphql-kotlin-spring-client` from 8.0.0 to 8.2.1 - [Release notes](https://github.com/ExpediaGroup/graphql-kotlin/releases) - [Commits](https://github.com/ExpediaGroup/graphql-kotlin/compare/8.0.0...8.2.1) Updates `com.expediagroup:graphql-kotlin-maven-plugin` from 8.0.0 to 8.2.1 - [Release notes](https://github.com/ExpediaGroup/graphql-kotlin/releases) - [Commits](https://github.com/ExpediaGroup/graphql-kotlin/compare/8.0.0...8.2.1) Updates `org.apache.kafka:kafka-streams` from 3.8.0 to 3.8.1 Updates `org.apache.kafka:kafka-clients` from 3.8.0 to 3.8.1 Updates `org.apache.kafka:kafka-streams-test-utils` from 3.8.0 to 3.8.1 Updates `org.apache.kafka:kafka-clients` from 3.8.0 to 3.8.1 Updates `no.nav.security:token-validation-spring` from 5.0.5 to 5.0.8 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](https://github.com/navikt/token-support/compare/5.0.5...5.0.8) Updates `no.nav.security:token-client-spring` from 5.0.5 to 5.0.8 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](https://github.com/navikt/token-support/compare/5.0.5...5.0.8) Updates `no.nav.security:token-client-spring` from 5.0.5 to 5.0.8 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](https://github.com/navikt/token-support/compare/5.0.5...5.0.8) Updates `org.springframework.boot:spring-boot-starter-test` from 3.3.4 to 3.3.5 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.4...v3.3.5) Updates `org.apache.kafka:kafka-streams-test-utils` from 3.8.0 to 3.8.1 Updates `org.testcontainers:kafka` from 1.20.2 to 1.20.3 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.20.2...1.20.3) Updates `io.mockk:mockk` from 1.13.12 to 1.13.13 - [Release notes](https://github.com/mockk/mockk/releases) - [Commits](https://github.com/mockk/mockk/compare/1.13.12...1.13.13) Updates `io.mockk:mockk-jvm` from 1.13.12 to 1.13.13 - [Release notes](https://github.com/mockk/mockk/releases) - [Commits](https://github.com/mockk/mockk/compare/1.13.12...1.13.13) Updates `io.mockk:mockk-jvm` from 1.13.12 to 1.13.13 - [Release notes](https://github.com/mockk/mockk/releases) - [Commits](https://github.com/mockk/mockk/compare/1.13.12...1.13.13) Updates `org.jetbrains.kotlin:kotlin-maven-allopen` from 2.0.20 to 2.0.21 Updates `org.jetbrains.kotlin:kotlin-maven-serialization` from 2.0.20 to 2.0.21 Updates `com.expediagroup:graphql-kotlin-maven-plugin` from 8.0.0 to 8.2.1 - [Release notes](https://github.com/ExpediaGroup/graphql-kotlin/releases) - [Commits](https://github.com/ExpediaGroup/graphql-kotlin/compare/8.0.0...8.2.1) Updates `org.springframework:spring-web` from 6.1.13 to 6.1.14 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.1.13...v6.1.14) Updates `io.swagger.core.v3:swagger-annotations` from 2.2.24 to 2.2.25 --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-parent dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.cyclonedx:cyclonedx-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-minor-patch - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.jetbrains.kotlin:kotlin-maven-allopen dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.jetbrains.kotlin:kotlin-maven-serialization dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: com.fasterxml.jackson.module:jackson-module-kotlin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-minor-patch - dependency-name: org.openapitools:openapi-generator-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-minor-patch - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.springframework.boot:spring-boot-starter-web dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.springframework.boot:spring-boot-starter-actuator dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.springframework.boot:spring-boot-starter-security dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.springframework.boot:spring-boot-starter-validation dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.springframework.boot:spring-boot-starter-test dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.springframework.boot:spring-boot-starter-actuator dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.springframework.boot:spring-boot-starter-security dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.testcontainers:junit-jupiter dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.testcontainers:kafka dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.springframework.boot:spring-boot-starter-validation dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: io.prometheus:prometheus-metrics-instrumentation-jvm dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: com.expediagroup:graphql-kotlin-spring-client dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-minor-patch - dependency-name: com.expediagroup:graphql-kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-minor-patch - dependency-name: org.apache.kafka:kafka-streams dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.apache.kafka:kafka-clients dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.apache.kafka:kafka-streams-test-utils dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.apache.kafka:kafka-clients dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: no.nav.security:token-validation-spring dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: no.nav.security:token-client-spring dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: no.nav.security:token-client-spring dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.springframework.boot:spring-boot-starter-test dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.apache.kafka:kafka-streams-test-utils dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.testcontainers:kafka dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: io.mockk:mockk dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: io.mockk:mockk-jvm dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: io.mockk:mockk-jvm dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.jetbrains.kotlin:kotlin-maven-allopen dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: org.jetbrains.kotlin:kotlin-maven-serialization dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: com.expediagroup:graphql-kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-minor-patch - dependency-name: org.springframework:spring-web dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch - dependency-name: io.swagger.core.v3:swagger-annotations dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-minor-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index d6a2ccfd..d403f288 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.4 + 3.3.5 @@ -18,55 +18,55 @@ 21 - 3.3.4 - 6.1.13 + 3.3.5 + 6.1.14 - 2.0.20 + 2.0.21 3.8.8 UTF-8 1.8.0 - 5.0.5 + 5.0.8 2.0 0.2.6 - 2.17.2 + 2.18.1 2.11.0 6.1.0 3.1.0 3.0.0 - 8.0.0 + 8.2.1 1.17.1 2.6.0 - 2.2.24 + 2.2.25 1.7.3 1.9.0 - 3.8.0 + 3.8.1 7.7.1 f52ace8dcc 8.0 - 1.3.1 + 1.3.2 - 1.20.2 - 1.13.12 + 1.20.3 + 1.13.13 4.0.2 2.27.2 3.4.2 2.17.1 - 7.8.0 - 2.8.2 + 7.9.0 + 2.9.0 3.5.0 - 3.5.0 + 3.5.1 1.3.2 From ca954bd54bb54ccdf3ec23316d20558ee327b71a Mon Sep 17 00:00:00 2001 From: nilsarne Date: Thu, 7 Nov 2024 13:43:46 +0100 Subject: [PATCH 2/3] Pakkeoppdateringer og tilpasning av kode etter oppdatering av tokensupport pakker --- arkiverer/pom.xml | 2 ++ .../arkivering/soknadsarkiverer/config/RestClientConfig.kt | 2 +- .../arkivering/soknadsarkiverer/config/SafMaskinClientConfig.kt | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arkiverer/pom.xml b/arkiverer/pom.xml index 929eef81..146ecd99 100644 --- a/arkiverer/pom.xml +++ b/arkiverer/pom.xml @@ -66,11 +66,13 @@ org.jetbrains.kotlin kotlin-reflect + com.expediagroup graphql-kotlin-spring-client diff --git a/arkiverer/src/main/kotlin/no/nav/soknad/arkivering/soknadsarkiverer/config/RestClientConfig.kt b/arkiverer/src/main/kotlin/no/nav/soknad/arkivering/soknadsarkiverer/config/RestClientConfig.kt index f42bea18..aeec8320 100644 --- a/arkiverer/src/main/kotlin/no/nav/soknad/arkivering/soknadsarkiverer/config/RestClientConfig.kt +++ b/arkiverer/src/main/kotlin/no/nav/soknad/arkivering/soknadsarkiverer/config/RestClientConfig.kt @@ -123,7 +123,7 @@ class RestClientConfig { body: ByteArray, execution: ClientHttpRequestExecution ): ClientHttpResponse { - val token = tokenService.getToken()?.accessToken + val token = tokenService.getToken()?.access_token val callId = MDC.get(Constants.HEADER_CALL_ID) logger.info("Kaller service med callId: $callId") diff --git a/arkiverer/src/main/kotlin/no/nav/soknad/arkivering/soknadsarkiverer/config/SafMaskinClientConfig.kt b/arkiverer/src/main/kotlin/no/nav/soknad/arkivering/soknadsarkiverer/config/SafMaskinClientConfig.kt index 1c863ef2..2911289d 100644 --- a/arkiverer/src/main/kotlin/no/nav/soknad/arkivering/soknadsarkiverer/config/SafMaskinClientConfig.kt +++ b/arkiverer/src/main/kotlin/no/nav/soknad/arkivering/soknadsarkiverer/config/SafMaskinClientConfig.kt @@ -66,7 +66,7 @@ class SafMaskinClientConfig( it.header(NAV_CONSUMER_ID, applicationName) it.header( HttpHeaders.AUTHORIZATION, - "$BEARER${oAuth2AccessTokenService.getAccessToken(getClientProperties(oauth2Config))?.accessToken}", + "$BEARER${oAuth2AccessTokenService.getAccessToken(getClientProperties(oauth2Config)).access_token}", ) } From 41296f66ef831e92fdb7bddc190ee06d75453f79 Mon Sep 17 00:00:00 2001 From: nilsarne Date: Fri, 8 Nov 2024 10:15:46 +0100 Subject: [PATCH 3/3] Oppdatering etter PR --- arkiverer/pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/arkiverer/pom.xml b/arkiverer/pom.xml index 146ecd99..6c204cc5 100644 --- a/arkiverer/pom.xml +++ b/arkiverer/pom.xml @@ -66,13 +66,6 @@ org.jetbrains.kotlin kotlin-reflect - com.expediagroup graphql-kotlin-spring-client