Skip to content

Commit 363f545

Browse files
authored
Merge branch 'main' into renovate/major-okhttp-monorepo
2 parents d76e630 + 58eb83f commit 363f545

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

.github/workflows/build-and-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/checkout@v5
1414

1515
- name: Setup JDK 11
16-
uses: actions/setup-java@v4
16+
uses: actions/setup-java@v5
1717
with:
1818
distribution: 'temurin'
1919
java-version: '11'
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/checkout@v5
2929

3030
- name: Setup JDK 17
31-
uses: actions/setup-java@v4
31+
uses: actions/setup-java@v5
3232
with:
3333
distribution: 'temurin'
3434
java-version: '17'

.github/workflows/generate-ref-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
ref: ${{ inputs.ref }}
3030

3131
- name: Setup java
32-
uses: actions/setup-java@v4
32+
uses: actions/setup-java@v5
3333
with:
3434
distribution: 'corretto'
3535
java-version: '21'

.github/workflows/manual-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
token: ${{ secrets.GITHUB_TOKEN }}
2828

2929
- name: Setup JDK 11
30-
uses: actions/setup-java@v4
30+
uses: actions/setup-java@v5
3131
with:
3232
distribution: 'temurin'
3333
java-version: '11'

.github/workflows/snapshot-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
ref: ${{ inputs.branch }}
1818

1919
- name: Set Up JDK
20-
uses: actions/setup-java@v4
20+
uses: actions/setup-java@v5
2121
with:
2222
distribution: 'temurin'
2323
java-version: '17'

exemplar/exemplar-sdk-rest/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
api("com.expediagroup:expediagroup-sdk-rest:1.0.0")
1313

1414
// Product SDKs have to add jackson libraries as a dependency.
15-
implementation(platform("com.fasterxml.jackson:jackson-bom:2.19.2"))
15+
implementation(platform("com.fasterxml.jackson:jackson-bom:2.20.0"))
1616
implementation("com.fasterxml.jackson.core:jackson-databind")
1717
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
1818
runtimeOnly("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")

exemplar/exemplar-server/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repositories {
2020
}
2121

2222
dependencies {
23-
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.11")
23+
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.13")
2424
implementation("org.springframework.boot:spring-boot-starter-web")
2525
implementation("org.springframework.boot:spring-boot-starter-graphql")
2626
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")

expediagroup-sdk-core/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717
api 'com.squareup.okio:okio:3.16.0'
1818

1919
/* Serialization/Deserialization */
20-
compileOnly(platform('com.fasterxml.jackson:jackson-bom:2.19.2'))
20+
compileOnly(platform('com.fasterxml.jackson:jackson-bom:2.20.0'))
2121
compileOnly 'com.fasterxml.jackson.core:jackson-databind'
2222
compileOnly 'com.fasterxml.jackson.module:jackson-module-kotlin'
2323

@@ -36,9 +36,9 @@ dependencies {
3636

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

39-
testImplementation(platform('com.fasterxml.jackson:jackson-bom:2.19.2'))
39+
testImplementation(platform('com.fasterxml.jackson:jackson-bom:2.20.0'))
4040
testImplementation 'com.fasterxml.jackson.core:jackson-databind'
41-
testImplementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.19.2'
41+
testImplementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.20.0'
4242
}
4343

4444
test {

expediagroup-sdk-rest/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ apply from: "$rootDir/gradle-tasks/signing.gradle"
1414

1515
dependencies {
1616
/* Serialization/Deserialization */
17-
compileOnly(platform('com.fasterxml.jackson:jackson-bom:2.19.2'))
17+
compileOnly(platform('com.fasterxml.jackson:jackson-bom:2.20.0'))
1818
compileOnly 'com.fasterxml.jackson.core:jackson-databind'
1919
compileOnly 'com.fasterxml.jackson.module:jackson-module-kotlin'
2020

@@ -36,9 +36,9 @@ dependencies {
3636

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

39-
testImplementation(platform('com.fasterxml.jackson:jackson-bom:2.19.2'))
39+
testImplementation(platform('com.fasterxml.jackson:jackson-bom:2.20.0'))
4040
testImplementation 'com.fasterxml.jackson.core:jackson-databind'
41-
testImplementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.19.2'
41+
testImplementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.20.0'
4242
}
4343

4444
test {

0 commit comments

Comments
 (0)