Merge pull request #207 from navikt/feature/pakkeoppdateringer

Feature/pakkeoppdateringer
navikt · Nov 8, 2024 · 2febffa · 2febffa
2 parents 86fe042 + 41296f6
commit 2febffa
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 22 deletions.
diff --git a/arkiverer/pom.xml b/arkiverer/pom.xml
@@ -66,11 +66,6 @@
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-reflect</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.module</groupId>
-			<artifactId>jackson-module-kotlin</artifactId>
-			<version>${jackson-module-kotlin.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>com.expediagroup</groupId>
 			<artifactId>graphql-kotlin-spring-client</artifactId>

diff --git a/...erer/src/main/kotlin/no/nav/soknad/arkivering/soknadsarkiverer/config/RestClientConfig.kt b/...erer/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/...src/main/kotlin/no/nav/soknad/arkivering/soknadsarkiverer/config/SafMaskinClientConfig.kt b/...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}",
 				)
 			}
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 		<relativePath/>
 	</parent>
 
@@ -18,55 +18,55 @@
 
 	<properties>
 		<java.version>21</java.version>
-		<spring-boot.version>3.3.4</spring-boot.version>
-		<spring-web.version>6.1.13</spring-web.version>
+		<spring-boot.version>3.3.5</spring-boot.version>
+		<spring-web.version>6.1.14</spring-web.version>
 
-		<kotlin.version>2.0.20</kotlin.version>
+		<kotlin.version>2.0.21</kotlin.version>
 		<maven.version>3.8.8</maven.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<springdoc.version>1.8.0</springdoc.version>
-		<token-support.version>5.0.5</token-support.version>
+		<token-support.version>5.0.8</token-support.version>
 		<jackson-coreutils.version>2.0</jackson-coreutils.version>
 		<jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
-		<jackson-module-kotlin.version>2.17.2</jackson-module-kotlin.version>
+		<jackson-module-kotlin.version>2.18.1</jackson-module-kotlin.version>
 		<gson.version>2.11.0</gson.version>
 		<jakarta-servlet-api.version>6.1.0</jakarta-servlet-api.version>
 		<jakarta-validation-api.version>3.1.0</jakarta-validation-api.version>
 		<jakarta-annotation.version>3.0.0</jakarta-annotation.version>
-		<graphql-kotlin.version>8.0.0</graphql-kotlin.version>
+		<graphql-kotlin.version>8.2.1</graphql-kotlin.version>
 		<commons-codec.version>1.17.1</commons-codec.version>
 
 		<!-- OpenAPI -->
 		<springdoc-openapi.version>2.6.0</springdoc-openapi.version>
-		<swagger-annotations.version>2.2.24</swagger-annotations.version>
+		<swagger-annotations.version>2.2.25</swagger-annotations.version>
 
 		<!--Kotlin-->
 		<kotlin-serialization.version>1.7.3</kotlin-serialization.version>
 		<coroutines.version>1.9.0</coroutines.version>
 
 		<!--Kafka-->
-		<kafka.version>3.8.0</kafka.version>
+		<kafka.version>3.8.1</kafka.version>
 		<kafka-streams-avro-serde.version>7.7.1</kafka-streams-avro-serde.version>
 		<arkivering-schemas.version>f52ace8dcc</arkivering-schemas.version>
 
 		<!--Logging-->
 		<logstash.version>8.0</logstash.version>
-		<prometheus.version>1.3.1</prometheus.version>
+		<prometheus.version>1.3.2</prometheus.version>
 
 		<!--Test-->
-		<testcontainers.version>1.20.2</testcontainers.version>
-		<mockk.version>1.13.12</mockk.version>
+		<testcontainers.version>1.20.3</testcontainers.version>
+		<mockk.version>1.13.13</mockk.version>
 		<springmockk.version>4.0.2</springmockk.version>
 		<wiremock.version>2.27.2</wiremock.version>
 		<kotlintest.version>3.4.2</kotlintest.version>
 
 		<!--Plugins-->
 		<versions-maven-plugin.version>2.17.1</versions-maven-plugin.version>
-		<openapi-generator-maven-plugin.version>7.8.0</openapi-generator-maven-plugin.version>
-		<cyclonedx-maven-plugin.version>2.8.2</cyclonedx-maven-plugin.version>
+		<openapi-generator-maven-plugin.version>7.9.0</openapi-generator-maven-plugin.version>
+		<cyclonedx-maven-plugin.version>2.9.0</cyclonedx-maven-plugin.version>
 		<maven-enforcer.version>3.5.0</maven-enforcer.version>
-		<maven-surefire.version>3.5.0</maven-surefire.version>
+		<maven-surefire.version>3.5.1</maven-surefire.version>
 		<junit-platform.version>1.3.2</junit-platform.version>
 	</properties>