Skip to content

Commit 83b59e0

Browse files
authored
Merge pull request #4183 from testcontainers/combined-pr-branch
2 parents 5fcbd6d + 8347e4f commit 83b59e0

File tree

6 files changed

+16
-12
lines changed

6 files changed

+16
-12
lines changed

.github/workflows/ci-examples.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ jobs:
1515
matrix: ${{ steps.set-matrix.outputs.matrix }}
1616
steps:
1717
- uses: actions/checkout@v2
18-
- uses: actions/setup-java@v1
18+
- uses: actions/setup-java@v2.1.0
1919
with:
20-
java-version: '1.8'
20+
java-version: '8.0.292+10'
21+
distribution: adopt-hotspot
2122
- name: Cache Gradle Home files
2223
uses: actions/[email protected]
2324
continue-on-error: true
@@ -42,9 +43,10 @@ jobs:
4243
runs-on: ubuntu-18.04
4344
steps:
4445
- uses: actions/checkout@v2
45-
- uses: actions/setup-java@v1
46+
- uses: actions/setup-java@v2.1.0
4647
with:
47-
java-version: '1.8'
48+
java-version: '8.0.292+10'
49+
distribution: adopt-hotspot
4850
- name: Cache Gradle Home files
4951
uses: actions/[email protected]
5052
continue-on-error: true

.github/workflows/ci.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ jobs:
1515
matrix: ${{ steps.set-matrix.outputs.matrix }}
1616
steps:
1717
- uses: actions/checkout@v2
18-
- uses: actions/setup-java@v1
18+
- uses: actions/setup-java@v2.1.0
1919
with:
20-
java-version: '1.8'
20+
java-version: '8.0.292+10'
21+
distribution: adopt-hotspot
2122
- name: Cache Gradle Home files
2223
uses: actions/[email protected]
2324
with:
@@ -40,9 +41,10 @@ jobs:
4041
runs-on: ubuntu-18.04
4142
steps:
4243
- uses: actions/checkout@v2
43-
- uses: actions/setup-java@v1
44+
- uses: actions/setup-java@v2.1.0
4445
with:
45-
java-version: '1.8'
46+
java-version: '8.0.292+10'
47+
distribution: adopt-hotspot
4648
- name: Cache Gradle Home files
4749
uses: actions/[email protected]
4850
continue-on-error: true

examples/linked-container/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ repositories {
77
}
88
dependencies {
99
compileOnly 'org.slf4j:slf4j-api:1.7.30'
10-
implementation 'com.squareup.okhttp3:okhttp:4.9.0'
10+
implementation 'com.squareup.okhttp3:okhttp:4.9.1'
1111
implementation 'org.json:json:20210307'
1212
testImplementation 'org.postgresql:postgresql:42.2.18'
1313
testImplementation 'ch.qos.logback:logback-classic:1.2.3'

modules/elasticsearch/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
22

33
dependencies {
44
compile project(':testcontainers')
5-
testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.12.1"
5+
testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.13.0"
66
testCompile "org.elasticsearch.client:transport:7.12.1"
77
testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
88
}

modules/kafka/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
33
dependencies {
44
compile project(':testcontainers')
55

6-
testCompile 'org.apache.kafka:kafka-clients:2.6.0'
6+
testCompile 'org.apache.kafka:kafka-clients:2.8.0'
77
testCompile 'org.assertj:assertj-core:3.18.1'
88
testCompile 'com.google.guava:guava:23.0'
99
}

modules/mariadb/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies {
77
compile project(':jdbc')
88

99
compileOnly project(':r2dbc')
10-
compileOnly 'org.mariadb:r2dbc-mariadb:1.0.0'
10+
compileOnly 'org.mariadb:r2dbc-mariadb:1.0.1'
1111

1212
testCompile project(':jdbc-test')
1313
testCompile 'org.mariadb.jdbc:mariadb-java-client:2.7.3'

0 commit comments

Comments
 (0)