Merge pull request #191 from navikt/feature/oppdater-versjoner

Oppdatert versjoner (inklusiv spring boot)
navikt · Dec 22, 2023 · 4b666bf · 4b666bf
2 parents 2a3941e + a23e857
commit 4b666bf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.1.3</version>
+    <version>3.2.0</version>
     <relativePath/> <!-- lookup parent from repository -->
   </parent>
 
@@ -23,22 +23,22 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
     <!-- dependencies -->
-    <bidrag-commons.version>20231103132440_edabbf8</bidrag-commons.version>
+    <bidrag-commons.version>20231201131246_f719b2b</bidrag-commons.version>
     <bidrag-commons-test.version>1.20230511093912_dc35d81</bidrag-commons-test.version>
-    <bidrag-beregn-forskudd-core.version>1.2.0</bidrag-beregn-forskudd-core.version>
+    <bidrag-beregn-forskudd-core.version>1.2.1</bidrag-beregn-forskudd-core.version>
     <bidrag-transport.version>20231204085259_0d4f13d</bidrag-transport.version>
     <springdoc-openapi-ui.version>2.2.0</springdoc-openapi-ui.version>
     <wiremock-standalone.version>2.35.1</wiremock-standalone.version>
     <springframework-cloud.version>4.0.2</springframework-cloud.version>
-    <token-support.version>3.1.3</token-support.version>
-    <com.squareup.okhttp3.version>4.9.2</com.squareup.okhttp3.version>
+    <token-support.version>3.2.0</token-support.version>
+    <com.squareup.okhttp3.version>4.12.0</com.squareup.okhttp3.version>
     <okhttp3.version>4.9.2</okhttp3.version>
-    <mockito-kotlin.version>4.1.0</mockito-kotlin.version>
-    <kotest.version>5.6.2</kotest.version>
+    <mockito-kotlin.version>5.2.1</mockito-kotlin.version>
+    <kotest.version>5.8.0</kotest.version>
     <mockk.version>4.0.2</mockk.version>
     <!-- language -->
     <java.version>21</java.version>
-    <kotlin.version>1.9.20</kotlin.version>
+    <kotlin.version>1.9.21</kotlin.version>
   </properties>
 
   <repositories>

diff --git a/src/test/kotlin/no/nav/bidrag/beregn/forskudd/rest/BidragBeregnForskuddLocal.kt b/src/test/kotlin/no/nav/bidrag/beregn/forskudd/rest/BidragBeregnForskuddLocal.kt
@@ -4,7 +4,6 @@ import com.github.tomakehurst.wiremock.WireMockServer
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration
 import no.nav.bidrag.beregn.forskudd.rest.BidragBeregnForskuddLocal.Companion.LOCAL_PROFILE
 import no.nav.security.token.support.spring.api.EnableJwtTokenValidation
-import no.nav.security.token.support.spring.test.EnableMockOAuth2Server
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration
 import org.springframework.boot.autoconfigure.SpringBootApplication
@@ -23,7 +22,6 @@ import org.springframework.test.context.ActiveProfiles
         ),
     ],
 )
-@EnableMockOAuth2Server
 @ActiveProfiles(LOCAL_PROFILE)
 class BidragBeregnForskuddLocal {
     companion object {