Merge remote-tracking branch 'refs/remotes/origin/master' into featur…

…e/rina-cdm

build.gradle

@@ -1,9 +1,9 @@
 buildscript {
     ext {
-        kotlinVersion = '1.9.22'
-        springBootVersion = '3.2.1'
-        springKafkaVersion = '3.1.1'
-        tokenSupportVersion = '4.0.5'
+        kotlinVersion = '1.9.23'
+        springBootVersion = '3.2.4'
+        springKafkaVersion = '3.1.4'
+        tokenSupportVersion = '4.1.4'
     }
 
     repositories {
@@ -44,15 +44,15 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-actuator")
 
     // Spring Framework BOM-fil overstyrer så vi får siste patch-versjon av Spring Framework
-    implementation(platform("org.springframework:spring-framework-bom:6.1.3"))
+    implementation(platform("org.springframework:spring-framework-bom:6.1.6"))
 
-    implementation('org.springframework.retry:spring-retry:2.0.4')
+    implementation('org.springframework.retry:spring-retry:2.0.5')
 
-    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.16.0'
+    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.17.0'
     implementation 'org.jetbrains.kotlin:kotlin-reflect'
 
     implementation "org.springframework.kafka:spring-kafka:$springKafkaVersion"
-    implementation("org.apache.httpcomponents.client5:httpclient5:5.3")
+    implementation("org.apache.httpcomponents.client5:httpclient5:5.3.1")
 
     //Auth
     implementation("no.nav.security:token-client-spring:${tokenSupportVersion}")
@@ -63,30 +63,30 @@ dependencies {
     // Logging
     implementation("net.logstash.logback:logstash-logback-encoder:7.4")
     configurations { all*.exclude group: 'commons-logging', module: 'commons-logging' }
-    implementation("org.slf4j:jcl-over-slf4j:2.0.11")
+    implementation("org.slf4j:jcl-over-slf4j:2.0.12")
 
     //eessi pensjon libs
-    implementation("no.nav.eessi.pensjon:ep-metrics:2.0.50")
-    implementation("no.nav.eessi.pensjon:ep-logging:2.1.47")
-    implementation("no.nav.eessi.pensjon:ep-eux:2.2.6") {
+    implementation("no.nav.eessi.pensjon:ep-metrics:2.0.62")
+    implementation("no.nav.eessi.pensjon:ep-logging:2.1.61")
+    implementation("no.nav.eessi.pensjon:ep-eux:2.2.38") {
         exclude module: 'ep-metrics'
     }
 
     //GCP
-    implementation("com.google.cloud:google-cloud-storage:2.30.1")
+    implementation("com.google.cloud:google-cloud-storage:2.36.1")
 
     //mock - test
-    testImplementation(platform("org.junit:junit-bom:5.10.1"))
+    testImplementation(platform("org.junit:junit-bom:5.10.2"))
     testImplementation("org.junit.jupiter:junit-jupiter")
     testImplementation("org.junit.jupiter:junit-jupiter-params")
 
     testImplementation("org.mock-server:mockserver-netty:5.15.0") {
         exclude module: 'junit'
     }
-    testImplementation "io.mockk:mockk:1.13.8"
+    testImplementation "io.mockk:mockk:1.13.10"
 
     // Architecture tests
-    testImplementation 'com.tngtech.archunit:archunit:1.2.1'
+    testImplementation 'com.tngtech.archunit:archunit:1.3.0'
 
     testImplementation("com.ninja-squad:springmockk:4.0.2")
     testImplementation('org.springframework.boot:spring-boot-starter-test') {

src/main/kotlin/no/nav/eessi/pensjon/config/OAuth2RestTemplateConfiguration.kt

@@ -59,7 +59,7 @@ class OAuth2RestTemplateConfiguration(
         oAuth2AccessTokenService: OAuth2AccessTokenService): ClientHttpRequestInterceptor {
         return ClientHttpRequestInterceptor { request: HttpRequest, body: ByteArray?, execution: ClientHttpRequestExecution ->
             val response = oAuth2AccessTokenService.getAccessToken(clientProperties)
-            request.headers.setBearerAuth(response?.accessToken!!)
+            request.headers.setBearerAuth(response.accessToken!!)
             execution.execute(request, body!!)
         }
     }