Skip to content

Commit e450b07

Browse files
authored
Merge pull request #10602 from testcontainers/combined-pr-branch
Combined dependencies PR
2 parents 51ad2bc + 2416af8 commit e450b07

10 files changed

+20
-20
lines changed

.github/workflows/ci-docker-wormhole.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
in-docker_test:
4545
runs-on: ubuntu-22.04
4646
steps:
47-
- uses: actions/checkout@v4
47+
- uses: actions/checkout@v5
4848
- name: Build with Gradle
4949
run: |
5050
docker run -i --rm \

.github/workflows/ci-rootless.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
permissions:
4747
checks: write
4848
steps:
49-
- uses: actions/checkout@v4
49+
- uses: actions/checkout@v5
5050
- name: Setup rootless Docker
5151
uses: docker/setup-docker-action@v4
5252
with:

.github/workflows/ci-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
permissions:
5353
checks: write
5454
steps:
55-
- uses: actions/checkout@v4
55+
- uses: actions/checkout@v5
5656
- uses: ./.github/actions/setup-build
5757
- name: Build with Gradle
5858
run: ./gradlew.bat cleanTest testcontainers:test --no-daemon --continue --scan --no-build-cache
@@ -78,7 +78,7 @@ jobs:
7878
target_url: `https://github.com/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`,
7979
context: 'CI - Windows',
8080
})
81-
- uses: actions/checkout@v4
81+
- uses: actions/checkout@v5
8282
with:
8383
token: ${{ secrets.GITHUB_TOKEN }}
8484
repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
matrix:
5555
java: [ '17', '21' ]
5656
steps:
57-
- uses: actions/checkout@v4
57+
- uses: actions/checkout@v5
5858
- uses: ./.github/actions/setup-build
5959
with:
6060
java-version: ${{ matrix.java }}
@@ -69,7 +69,7 @@ jobs:
6969
permissions:
7070
checks: write
7171
steps:
72-
- uses: actions/checkout@v4
72+
- uses: actions/checkout@v5
7373
- uses: ./.github/actions/setup-build
7474
- name: Setup Testcontainers Cloud Client
7575
uses: atomicjar/testcontainers-cloud-setup-action@main
@@ -88,7 +88,7 @@ jobs:
8888
outputs:
8989
matrix: ${{ steps.set-matrix.outputs.matrix }}
9090
steps:
91-
- uses: actions/checkout@v4
91+
- uses: actions/checkout@v5
9292
- uses: ./.github/actions/setup-java
9393
- name: Setup Gradle Build Action
9494
uses: gradle/actions/setup-gradle@v4
@@ -110,7 +110,7 @@ jobs:
110110
permissions:
111111
checks: write
112112
steps:
113-
- uses: actions/checkout@v4
113+
- uses: actions/checkout@v5
114114
- uses: ./.github/actions/setup-build
115115
- name: Build and test with Gradle (${{matrix.gradle_args}})
116116
run: |
@@ -123,7 +123,7 @@ jobs:
123123
outputs:
124124
matrix: ${{ steps.set-matrix.outputs.matrix }}
125125
steps:
126-
- uses: actions/checkout@v4
126+
- uses: actions/checkout@v5
127127
- uses: ./.github/actions/setup-java
128128
- name: Setup Gradle Build Action
129129
uses: gradle/actions/setup-gradle@v4
@@ -146,7 +146,7 @@ jobs:
146146
permissions:
147147
checks: write
148148
steps:
149-
- uses: actions/checkout@v4
149+
- uses: actions/checkout@v5
150150
- uses: ./.github/actions/setup-build
151151
- name: Build and test Examples with Gradle (${{matrix.gradle_args}})
152152
working-directory: ./examples/
@@ -160,7 +160,7 @@ jobs:
160160
outputs:
161161
matrix: ${{ steps.set-matrix.outputs.matrix }}
162162
steps:
163-
- uses: actions/checkout@v4
163+
- uses: actions/checkout@v5
164164
- uses: ./.github/actions/setup-java
165165
- name: Setup Gradle Build Action
166166
uses: gradle/actions/setup-gradle@v4
@@ -182,7 +182,7 @@ jobs:
182182
permissions:
183183
checks: write
184184
steps:
185-
- uses: actions/checkout@v4
185+
- uses: actions/checkout@v5
186186
- uses: ./.github/actions/setup-build
187187
- name: Build and test with Gradle (${{matrix.gradle_args}})
188188
run: |

.github/workflows/moby-latest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-22.04
2222
continue-on-error: true
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525
- uses: ./.github/actions/setup-build
2626

2727
- name: Install Stable Docker

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
release:
1616
runs-on: ubuntu-22.04
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919
- uses: ./.github/actions/setup-java
2020
- name: Clear existing docker image cache
2121
run: docker image prune -af

.github/workflows/update-docs-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
if: github.repository == 'testcontainers/testcontainers-java'
1616
runs-on: ubuntu-22.04
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919
with:
2020
ref: main
2121
- name: Update latest_version property in mkdocs.yml

.github/workflows/update-gradle-wrapper.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717

1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020

2121
- name: Update Gradle Wrapper
2222
uses: gradle-update/update-gradle-wrapper-action@512b1875f3b6270828abfe77b247d5895a2da1e5 # v1.0.13

.github/workflows/update-testcontainers-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
if: github.repository == 'testcontainers/testcontainers-java'
1616
runs-on: ubuntu-22.04
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919
with:
2020
ref: main
2121
- name: Update testcontainers.version property in gradle.properties

core/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ dependencies {
109109
exclude group: 'com.google.guava', module: 'guava'
110110
}
111111
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
112-
testImplementation 'redis.clients:jedis:6.0.0'
112+
testImplementation 'redis.clients:jedis:6.1.0'
113113
testImplementation 'com.rabbitmq:amqp-client:5.26.0'
114114
testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
115115

@@ -119,13 +119,13 @@ dependencies {
119119
// Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
120120
testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
121121

122-
testImplementation 'org.assertj:assertj-core:3.27.3'
122+
testImplementation 'org.assertj:assertj-core:3.27.4'
123123
testImplementation 'io.rest-assured:rest-assured:5.5.5'
124124

125125
jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
126126
jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
127127
jarFileTestImplementation 'junit:junit:4.13.2'
128-
jarFileTestImplementation 'org.assertj:assertj-core:3.27.3'
128+
jarFileTestImplementation 'org.assertj:assertj-core:3.27.4'
129129
jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'
130130
}
131131

0 commit comments

Comments
 (0)