Skip to content

Commit 884a621

Browse files
committed
bump
1 parent 1f9435e commit 884a621

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

app/build.gradle.kts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
55
plugins {
66
val kotlinVersion = "2.2.20"
77
val springBootVersion = "3.5.4"
8-
98
val springDepMgmtVersion = "1.1.7"
109
val versionsVersion = "0.52.0"
1110

@@ -14,7 +13,7 @@ plugins {
1413

1514
id("org.springframework.boot") version springBootVersion
1615
id("io.spring.dependency-management") version springDepMgmtVersion
17-
id("com.github.ben-manes.versions") version versionsVersion // ./gradlew dependencyUpdates to check for new versions
16+
id("com.github.ben-manes.versions") version versionsVersion
1817
}
1918

2019
java {
@@ -29,7 +28,7 @@ dependencies {
2928
val logstashVersion = "8.1"
3029
val opensearchVersion = "2.0.2"
3130
val jsoupVersion = "1.21.2"
32-
val opensearchTestcontainersVersion = "2.1.3"
31+
val opensearchTestcontainersVersion = "3.0.2"
3332
val testcontainersVersion = "1.21.3"
3433
val wiremockVersion = "4.3.0"
3534
val kotestVersion = "6.0.3"
@@ -46,10 +45,9 @@ dependencies {
4645
implementation("org.springframework.boot:spring-boot-starter-aop")
4746
implementation("net.logstash.logback:logstash-logback-encoder:$logstashVersion")
4847
implementation("io.micrometer:micrometer-registry-prometheus")
49-
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
5048
implementation("org.jsoup:jsoup:$jsoupVersion")
51-
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}")
52-
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:${jacksonVersion}")
49+
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion")
50+
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
5351
testImplementation("org.opensearch.client:spring-data-opensearch-test-autoconfigure:$opensearchVersion") {
5452
exclude("org.opensearch.client", "opensearch-rest-client-sniffer")
5553
}
@@ -74,4 +72,4 @@ tasks.withType<Test> {
7472
exceptionFormat = TestExceptionFormat.FULL
7573
events("passed", "skipped", "failed")
7674
}
77-
}
75+
}

app/src/test/kotlin/no/nav/navnosearchadminapi/integrationtests/config/OpensearchConfig.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
package no.nav.navnosearchadminapi.integrationtests.config
22

3-
import org.opensearch.testcontainers.OpensearchContainer
3+
import org.opensearch.testcontainers.OpenSearchContainer
44
import org.springframework.boot.test.context.TestConfiguration
5+
import org.testcontainers.utility.DockerImageName
56
import java.time.Duration
67

78
@TestConfiguration
89
class OpensearchConfig {
910
companion object {
10-
private val opensearch: OpensearchContainer<*> = OpensearchContainer("opensearchproject/opensearch:2.11.1")
11-
.withStartupAttempts(5)
12-
.withStartupTimeout(Duration.ofMinutes(2))
11+
private val opensearch: OpenSearchContainer<*> =
12+
OpenSearchContainer(
13+
DockerImageName.parse("opensearchproject/opensearch:2.11.1")
14+
)
15+
.withStartupAttempts(5)
16+
.withStartupTimeout(Duration.ofMinutes(2))
1317

1418
init {
1519
opensearch.start()

0 commit comments

Comments
 (0)