Skip to content

Commit b307e28

Browse files
authored
Merge branch 'main' into renovate/com.fasterxml.jackson-jackson-bom-2.x
2 parents 9e16f73 + 1700f63 commit b307e28

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import java.time.Duration
44

55
plugins {
66
id 'java'
7-
id 'org.jetbrains.kotlin.jvm' version '2.1.10' apply false
7+
id 'org.jetbrains.kotlin.jvm' version '2.2.0' apply false
88
id "org.jlleitschuh.gradle.ktlint" version "12.1.2" apply false
99
id 'org.jetbrains.kotlinx.kover' version "0.9.1" apply false
1010
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'

expediagroup-sdk-core/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ dependencies {
3030
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
3131
testImplementation 'org.junit.jupiter:junit-jupiter-params'
3232

33-
testImplementation 'io.mockk:mockk:1.14.4'
33+
testImplementation 'io.mockk:mockk:1.14.5'
3434
testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'
3535

3636
testImplementation 'org.slf4j:slf4j-api:2.0.17'
3737

3838
testImplementation(platform('com.fasterxml.jackson:jackson-bom:2.19.2'))
3939
testImplementation 'com.fasterxml.jackson.core:jackson-databind'
40-
testImplementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.19.1'
40+
testImplementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.19.2'
4141
}
4242

4343
test {

expediagroup-sdk-graphql/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dependencies {
2828
testImplementation 'org.junit.jupiter:junit-jupiter-api'
2929
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
3030
testImplementation 'org.junit.jupiter:junit-jupiter-params'
31-
testImplementation 'io.mockk:mockk:1.14.4'
31+
testImplementation 'io.mockk:mockk:1.14.5'
3232
testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'
3333
testImplementation 'org.slf4j:slf4j-api:2.0.17'
3434
}

expediagroup-sdk-rest/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ dependencies {
3030
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
3131
testImplementation 'org.junit.jupiter:junit-jupiter-params'
3232

33-
testImplementation 'io.mockk:mockk:1.14.4'
33+
testImplementation 'io.mockk:mockk:1.14.5'
3434
testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'
3535

3636
testImplementation 'org.slf4j:slf4j-api:2.0.17'
3737

3838
testImplementation(platform('com.fasterxml.jackson:jackson-bom:2.19.2'))
3939
testImplementation 'com.fasterxml.jackson.core:jackson-databind'
40-
testImplementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.19.1'
40+
testImplementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.19.2'
4141
}
4242

4343
test {

expediagroup-sdk-transport-okhttp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies {
2727
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
2828
testImplementation 'org.junit.jupiter:junit-jupiter-params'
2929

30-
testImplementation 'io.mockk:mockk:1.14.4'
30+
testImplementation 'io.mockk:mockk:1.14.5'
3131
testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'
3232

3333
testImplementation(project(':expediagroup-sdk-core'))

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
2+
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
33
}
44

55
rootProject.name = "expediagroup-java-sdk"

0 commit comments

Comments
 (0)