From 7c0e71f110220023ff2111d1e8baee28d268c235 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 3 Nov 2024 04:08:15 +0000 Subject: [PATCH 1/2] Bump the backend group with 7 updates Bumps the backend group with 7 updates: | Package | From | To | | --- | --- | --- | | [org.springframework.boot:spring-boot-dependencies](https://github.com/spring-projects/spring-boot) | `3.3.4` | `3.3.5` | | [jvm](https://github.com/JetBrains/kotlin) | `2.0.20` | `2.0.21` | | no.nav.tilleggsstonader.kontrakter:tilleggsstonader-kontrakter | `2024.10.23-11.11.2c32dd0d96d6` | `2024.10.31-11.26.7172148519ea` | | [no.nav.security:token-client-core](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` | | [no.nav.security:token-validation-spring](https://github.com/navikt/token-support) | `5.0.5` | `5.0.8` | | [plugin.spring](https://github.com/JetBrains/kotlin) | `2.0.20` | `2.0.21` | Updates `org.springframework.boot:spring-boot-dependencies` 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 `jvm` 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 `no.nav.tilleggsstonader.kontrakter:tilleggsstonader-kontrakter` from 2024.10.23-11.11.2c32dd0d96d6 to 2024.10.31-11.26.7172148519ea Updates `no.nav.security:token-client-core` 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-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-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 `plugin.spring` 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) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-patch dependency-group: backend - dependency-name: jvm dependency-type: direct:production update-type: version-update:semver-patch dependency-group: backend - dependency-name: no.nav.tilleggsstonader.kontrakter:tilleggsstonader-kontrakter dependency-type: direct:production update-type: version-update:semver-patch dependency-group: backend - dependency-name: no.nav.security:token-client-core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: backend - dependency-name: no.nav.security:token-client-spring dependency-type: direct:production update-type: version-update:semver-patch dependency-group: backend - dependency-name: no.nav.security:token-validation-spring dependency-type: direct:production update-type: version-update:semver-patch dependency-group: backend - dependency-name: no.nav.security:token-client-spring dependency-type: direct:production update-type: version-update:semver-patch dependency-group: backend - dependency-name: no.nav.security:token-validation-spring dependency-type: direct:production update-type: version-update:semver-patch dependency-group: backend - dependency-name: plugin.spring dependency-type: direct:production update-type: version-update:semver-patch dependency-group: backend ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 4 ++-- http-client/build.gradle.kts | 6 +++--- kafka/build.gradle.kts | 2 +- log/build.gradle.kts | 2 +- sikkerhet/build.gradle.kts | 4 ++-- unleash/build.gradle.kts | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6f67fc0..2b5c869 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ val javaVersion = JavaLanguageVersion.of(21) plugins { - kotlin("jvm") version "2.0.20" + kotlin("jvm") version "2.0.21" `maven-publish` `java-library` id("com.diffplug.spotless") version "6.25.0" @@ -46,7 +46,7 @@ subprojects { } dependencies { - implementation(platform("org.springframework.boot:spring-boot-dependencies:3.3.4")) + implementation(platform("org.springframework.boot:spring-boot-dependencies:3.3.5")) testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.assertj:assertj-core") diff --git a/http-client/build.gradle.kts b/http-client/build.gradle.kts index 6e24344..8bfbe6e 100644 --- a/http-client/build.gradle.kts +++ b/http-client/build.gradle.kts @@ -1,9 +1,9 @@ -val tokenSupportVersion = "5.0.5" +val tokenSupportVersion = "5.0.8" val wiremockVersion = "3.0.1" -val tilleggsstønaderKontrakterVersion = "2024.10.23-11.11.2c32dd0d96d6" +val tilleggsstønaderKontrakterVersion = "2024.10.31-11.26.7172148519ea" plugins { - kotlin("plugin.spring") version "2.0.20" + kotlin("plugin.spring") version "2.0.21" } dependencies { diff --git a/kafka/build.gradle.kts b/kafka/build.gradle.kts index a9c0b06..a336655 100644 --- a/kafka/build.gradle.kts +++ b/kafka/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("plugin.spring") version "2.0.20" + kotlin("plugin.spring") version "2.0.21" } dependencies { diff --git a/log/build.gradle.kts b/log/build.gradle.kts index 169ec90..b8b2e12 100644 --- a/log/build.gradle.kts +++ b/log/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("plugin.spring") version "2.0.20" + kotlin("plugin.spring") version "2.0.21" } dependencies { diff --git a/sikkerhet/build.gradle.kts b/sikkerhet/build.gradle.kts index fc10879..78b2d5a 100644 --- a/sikkerhet/build.gradle.kts +++ b/sikkerhet/build.gradle.kts @@ -1,7 +1,7 @@ -val tokenSupportVersion = "5.0.5" +val tokenSupportVersion = "5.0.8" plugins { - kotlin("plugin.spring") version "2.0.20" + kotlin("plugin.spring") version "2.0.21" } dependencies { diff --git a/unleash/build.gradle.kts b/unleash/build.gradle.kts index 2937590..7a89b43 100644 --- a/unleash/build.gradle.kts +++ b/unleash/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("plugin.spring") version "2.0.20" + kotlin("plugin.spring") version "2.0.21" } dependencies { From 332276593167de7fceb195d0bf67d1020833286c Mon Sep 17 00:00:00 2001 From: Johan Blomgren Date: Mon, 4 Nov 2024 09:14:40 +0100 Subject: [PATCH 2/2] OAuth2AccessTokenResponse har erstatt accessToken med access_token https://github.com/navikt/token-support/commit/22c3c9b9d44ea6e996ace02013f65fa5408dbe32 --- .../libs/http/interceptor/BearerTokenClientInterceptor.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http-client/main/no/nav/tilleggsstonader/libs/http/interceptor/BearerTokenClientInterceptor.kt b/http-client/main/no/nav/tilleggsstonader/libs/http/interceptor/BearerTokenClientInterceptor.kt index dcfee38..69c1a9d 100644 --- a/http-client/main/no/nav/tilleggsstonader/libs/http/interceptor/BearerTokenClientInterceptor.kt +++ b/http-client/main/no/nav/tilleggsstonader/libs/http/interceptor/BearerTokenClientInterceptor.kt @@ -115,7 +115,7 @@ private fun genererAccessToken( clientConfigurationProperties, grantType, ) - return oAuth2AccessTokenService.getAccessToken(clientProperties).accessToken + return oAuth2AccessTokenService.getAccessToken(clientProperties).access_token ?: throw JwtTokenMissingException() }