Skip to content

Commit bc1d616

Browse files
authored
Merge pull request testcontainers#4765 from testcontainers/combined-pr-branch
2 parents 4adabdc + 2909e8c commit bc1d616

File tree

28 files changed

+44
-44
lines changed

28 files changed

+44
-44
lines changed

.github/workflows/ci-examples.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
matrix: ${{ steps.set-matrix.outputs.matrix }}
1717
steps:
1818
- uses: actions/checkout@v2
19-
- uses: actions/setup-java@v2.3.1
19+
- uses: actions/setup-java@v2.4.0
2020
with:
2121
java-version: '8.0.302'
2222
distribution: temurin
2323
- name: Cache Gradle Home files
24-
uses: actions/cache@v2.1.6
24+
uses: actions/cache@v2.1.7
2525
continue-on-error: true
2626
with:
2727
path: ~/.gradle/caches
@@ -44,12 +44,12 @@ jobs:
4444
runs-on: ubuntu-18.04
4545
steps:
4646
- uses: actions/checkout@v2
47-
- uses: actions/setup-java@v2.3.1
47+
- uses: actions/setup-java@v2.4.0
4848
with:
4949
java-version: '8.0.302'
5050
distribution: temurin
5151
- name: Cache Gradle Home files
52-
uses: actions/cache@v2.1.6
52+
uses: actions/cache@v2.1.7
5353
continue-on-error: true
5454
with:
5555
path: ~/.gradle/caches

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424
matrix: ${{ steps.set-matrix.outputs.matrix }}
2525
steps:
2626
- uses: actions/checkout@v2
27-
- uses: actions/setup-java@v2.3.1
27+
- uses: actions/setup-java@v2.4.0
2828
with:
2929
java-version: '8.0.302'
3030
distribution: temurin
3131
- name: Cache Gradle Home files
32-
uses: actions/cache@v2.1.6
32+
uses: actions/cache@v2.1.7
3333
with:
3434
path: ~/.gradle/caches
3535
key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
@@ -50,12 +50,12 @@ jobs:
5050
runs-on: ubuntu-18.04
5151
steps:
5252
- uses: actions/checkout@v2
53-
- uses: actions/setup-java@v2.3.1
53+
- uses: actions/setup-java@v2.4.0
5454
with:
5555
java-version: '8.0.302'
5656
distribution: temurin
5757
- name: Cache Gradle Home files
58-
uses: actions/cache@v2.1.6
58+
uses: actions/cache@v2.1.7
5959
continue-on-error: true
6060
with:
6161
path: ~/.gradle/caches

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-18.04
1414
steps:
1515
- uses: actions/checkout@v2
16-
- uses: actions/setup-java@v2.3.1
16+
- uses: actions/setup-java@v2.4.0
1717
with:
1818
java-version: '8.0.302'
1919
distribution: temurin

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
1818
git diff
1919
- name: Create Pull Request
20-
uses: peter-evans/create-pull-request@3c3d696d5b8aa2eb0e70f76c251e4b149122acf1 # v3.10.1
20+
uses: peter-evans/create-pull-request@67df31e08a133c6a77008b89689677067fef169e # v3.10.1
2121
with:
2222
title: Update docs version to ${GITHUB_REF##*/}
2323
body: |

core/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ dependencies {
5959

6060
api 'junit:junit:4.13.2'
6161
api 'org.slf4j:slf4j-api:1.7.32'
62-
compileOnly 'org.jetbrains:annotations:22.0.0'
63-
testCompileClasspath 'org.jetbrains:annotations:21.0.1'
62+
compileOnly 'org.jetbrains:annotations:23.0.0'
63+
testCompileClasspath 'org.jetbrains:annotations:23.0.0'
6464
api 'org.apache.commons:commons-compress:1.21'
6565
api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
6666
exclude(group: 'org.jetbrains', module: 'annotations')
@@ -90,10 +90,10 @@ dependencies {
9090

9191
testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
9292
testImplementation 'redis.clients:jedis:3.7.0'
93-
testImplementation 'com.rabbitmq:amqp-client:5.13.1'
93+
testImplementation 'com.rabbitmq:amqp-client:5.14.0'
9494
testImplementation 'org.mongodb:mongo-java-driver:3.12.10'
9595

96-
testImplementation ('org.mockito:mockito-core:4.0.0') {
96+
testImplementation ('org.mockito:mockito-core:4.1.0') {
9797
exclude(module: 'hamcrest-core')
9898
}
9999
// Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

examples/cucumber/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ dependencies {
1111
implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.141.59'
1212
implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.141.59'
1313
testImplementation 'io.cucumber:cucumber-java:7.1.0'
14-
testImplementation 'io.cucumber:cucumber-junit:7.0.0'
14+
testImplementation 'io.cucumber:cucumber-junit:7.1.0'
1515
testImplementation 'org.testcontainers:selenium'
1616
}

examples/disque-job-queue/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
implementation 'biz.paluch.redis:spinach:0.3'
1313
implementation 'com.google.code.gson:gson:2.8.9'
1414
implementation 'com.google.guava:guava:23.0'
15-
testImplementation 'ch.qos.logback:logback-classic:1.2.6'
15+
testImplementation 'ch.qos.logback:logback-classic:1.2.7'
1616
testImplementation 'org.mockito:mockito-all:1.10.19'
1717
testImplementation 'org.testcontainers:testcontainers'
1818
testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

examples/kafka-cluster/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ dependencies {
1313
testImplementation 'org.apache.kafka:kafka-clients:3.0.0'
1414
testImplementation 'org.assertj:assertj-core:3.21.0'
1515
testImplementation 'com.google.guava:guava:23.0'
16-
testImplementation 'ch.qos.logback:logback-classic:1.2.6'
16+
testImplementation 'ch.qos.logback:logback-classic:1.2.7'
1717
}

examples/linked-container/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ repositories {
77
}
88
dependencies {
99
compileOnly 'org.slf4j:slf4j-api:1.7.32'
10-
implementation 'com.squareup.okhttp3:okhttp:4.9.2'
10+
implementation 'com.squareup.okhttp3:okhttp:4.9.3'
1111
implementation 'org.json:json:20210307'
1212
testImplementation 'org.postgresql:postgresql:42.3.1'
13-
testImplementation 'ch.qos.logback:logback-classic:1.2.6'
13+
testImplementation 'ch.qos.logback:logback-classic:1.2.7'
1414
testImplementation 'org.testcontainers:postgresql'
1515
}
1616

examples/mongodb-container/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ repositories {
99
dependencies {
1010
testImplementation 'org.testcontainers:testcontainers'
1111
testImplementation 'junit:junit:4.13.2'
12-
testCompileClasspath 'org.jetbrains:annotations:22.0.0'
12+
testCompileClasspath 'org.jetbrains:annotations:23.0.0'
1313
}

0 commit comments

Comments
 (0)