Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump org.springframework.boot:spring-boot-dependencies from 3.1.5 to 3.2.0 #751

Merged
merged 3 commits into from
Jan 15, 2024
Merged

Bump org.springframework.boot:spring-boot-dependencies from 3.1.5 to 3.2.0 #751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f1280f
Bump org.springframework.boot:spring-boot-dependencies
dependabot[bot] Nov 26, 2023
61848b3
bumper pakker som man trenger i spring boot 3.2.0
stigebil Dec 13, 2023
4a0071a
Sletter ubrukt interceptor, fikser tester og oppgraderer kotling for …
stigebil Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 0 additions & 44 deletions ...main/java/no/nav/familie/http/interceptor/TimingAndLoggingClientHttpRequestInterceptor.kt
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Denne kompilerte ikke med ny versjon av spring, men slettet den i stedet for å fikse denne, siden en søk i github viste at ingen av våre prosjekter brukte denne.

This file was deleted.

4 changes: 2 additions & 2 deletions kafka/src/test/kotlin/no/nav/familie/kafka/KafkaErrorHandlerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package no.nav.familie.kafka
import io.mockk.MockKAnnotations
import io.mockk.clearAllMocks
import io.mockk.impl.annotations.MockK
import io.mockk.mockk
import org.apache.kafka.clients.consumer.Consumer
import org.apache.kafka.clients.consumer.ConsumerRecord
import org.assertj.core.api.Assertions.assertThat
Expand All @@ -12,7 +13,6 @@ import org.junit.jupiter.api.Test
import org.junit.jupiter.api.TestInstance
import org.springframework.kafka.listener.MessageListenerContainer
import org.springframework.scheduling.TaskScheduler
import org.springframework.scheduling.concurrent.DefaultManagedTaskScheduler

@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class KafkaErrorHandlerTest {
Expand All @@ -22,7 +22,7 @@ class KafkaErrorHandlerTest {
@MockK(relaxed = true)
lateinit var consumer: Consumer<*, *>

private val taskScheduler: TaskScheduler = DefaultManagedTaskScheduler()
private val taskScheduler: TaskScheduler = mockk(relaxed = true)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ny versjon av spring støtter ikke å opprette TaskScheduler på annen måte enn gjennom Bean, men siden vi ikke bruker denne direkte i testen, så oppgraderte jeg testen til å bruke mock


private val errorHandler: KafkaErrorHandler = KafkaErrorHandler(taskScheduler)

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@

<kontrakter.version>3.0_20230428084827_0b6a892-JAKARTA</kontrakter.version>
<kotest.version>5.8.0</kotest.version>
<kotlin.version>1.9.20</kotlin.version>
<kotlin.version>1.9.21</kotlin.version>
<mockk.version>1.13.7</mockk.version>
<nav.security.token.version>3.1.9</nav.security.token.version>
<nav.security.token.version>3.2.0</nav.security.token.version>

<!--suppress UnresolvedMavenProperty Ligger som secret i github-->
<sonar.projectKey>${SONAR_PROJECTKEY}</sonar.projectKey>
Expand Down Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.1.5</version>
<version>3.2.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down