Skip to content

Commit

Permalink
Merge branch 'main' into fjerner_cpu_limit
Browse files Browse the repository at this point in the history
  • Loading branch information
halvorbmundal authored Aug 8, 2023
2 parents 0457716 + 945044d commit 8e19af2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.1.1</version>
<version>3.1.2</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<repositories>
Expand All @@ -33,9 +33,9 @@
<springdoc.version>2.1.0</springdoc.version>
<mockk-jvm.version>1.13.5</mockk-jvm.version>
<felles.version>2.20230210162649_a258d57-SPRING_BOOT_3</felles.version>
<prosessering.version>2.20230621155918_9c5de0f</prosessering.version>
<prosessering.version>2.20230713120621_747ed8f</prosessering.version>
<start-class>no.nav.familie.klage.ApplicationKt</start-class>
<kontrakter.version>3.0_20230705132547_9303863</kontrakter.version>
<kontrakter.version>3.0_20230731084015_3570802</kontrakter.version>
<saksstatistikk-klage.version>2.0_20230214104704_706e9c0</saksstatistikk-klage.version>
<nav.security.version>3.0.8</nav.security.version> <!-- Denne burde være samme versjon som i felles -->
<okhttp3.version>4.9.1</okhttp3.version> <!-- overskrever spring sin versjon, blir brukt av mock-oauth2-server -->
Expand Down

0 comments on commit 8e19af2

Please sign in to comment.