Merge pull request #4183 from testcontainers/combined-pr-branch

testcontainers · Jun 9, 2021 · 83b59e0 · 83b59e0
2 parents 5fcbd6d + 8347e4f
commit 83b59e0
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
@@ -15,9 +15,10 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2.1.0
         with:
-          java-version: '1.8'
+          java-version: '8.0.292+10'
+          distribution: adopt-hotspot
       - name: Cache Gradle Home files
         uses: actions/cache@v2.1.6
         continue-on-error: true
@@ -42,9 +43,10 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2.1.0
         with:
-          java-version: '1.8'
+          java-version: '8.0.292+10'
+          distribution: adopt-hotspot
       - name: Cache Gradle Home files
         uses: actions/cache@v2.1.6
         continue-on-error: true

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,9 +15,10 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2.1.0
         with:
-          java-version: '1.8'
+          java-version: '8.0.292+10'
+          distribution: adopt-hotspot
       - name: Cache Gradle Home files
         uses: actions/cache@v2.1.6
         with:
@@ -40,9 +41,10 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2.1.0
         with:
-          java-version: '1.8'
+          java-version: '8.0.292+10'
+          distribution: adopt-hotspot
       - name: Cache Gradle Home files
         uses: actions/cache@v2.1.6
         continue-on-error: true

diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
-    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     implementation 'org.json:json:20210307'
     testImplementation 'org.postgresql:postgresql:42.2.18'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.12.1"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.13.0"
     testCompile "org.elasticsearch.client:transport:7.12.1"
     testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.apache.kafka:kafka-clients:2.6.0'
+    testCompile 'org.apache.kafka:kafka-clients:2.8.0'
     testCompile 'org.assertj:assertj-core:3.18.1'
     testCompile 'com.google.guava:guava:23.0'
 }
diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compile project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'org.mariadb:r2dbc-mariadb:1.0.0'
+    compileOnly 'org.mariadb:r2dbc-mariadb:1.0.1'
 
     testCompile project(':jdbc-test')
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.7.3'