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

Author: rnorth

examples/spring-boot-kotlin-redis/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id("org.springframework.boot") version "2.4.1"
-    id("org.jetbrains.kotlin.jvm") version "1.4.32"
+    id("org.jetbrains.kotlin.jvm") version "1.5.10"
     id("org.jetbrains.kotlin.plugin.spring") version "1.5.10"
 }
 

modules/jdbc/build.gradle

@@ -4,7 +4,7 @@ dependencies {
     compile project(':database-commons')
     testCompile project(':test-support')
 
-    compileOnly 'org.jetbrains:annotations:20.1.0'
+    compileOnly 'org.jetbrains:annotations:21.0.1'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:25.0'
     testCompile 'org.apache.tomcat:tomcat-jdbc:10.0.6'

modules/junit-jupiter/build.gradle

@@ -6,7 +6,7 @@ dependencies {
 
     testCompile project(':mysql')
     testCompile project(':postgresql')
-    testCompile 'com.zaxxer:HikariCP:3.4.5'
+    testCompile 'com.zaxxer:HikariCP:4.0.3'
     testCompile 'redis.clients:jedis:3.6.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.13'
     testCompile ('org.mockito:mockito-core:3.10.0') {
@@ -16,7 +16,7 @@ dependencies {
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.7.1'
 
     testRuntime 'org.postgresql:postgresql:42.2.20'
-    testRuntime 'mysql:mysql-connector-java:8.0.22'
+    testRuntime 'mysql:mysql-connector-java:8.0.25'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
 }
 

modules/localstack/build.gradle

@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.1030'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.1030'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.1018'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.12.1'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
     testCompile 'software.amazon.awssdk:s3:2.16.62'
     testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

modules/nginx/build.gradle

@@ -2,6 +2,6 @@ description = "Testcontainers :: Nginx"
 
 dependencies {
     compile project(':testcontainers')
-    compileOnly 'org.jetbrains:annotations:20.1.0'
+    compileOnly 'org.jetbrains:annotations:21.0.1'
     testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

modules/postgresql/build.gradle

@@ -16,5 +16,5 @@ dependencies {
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'io.r2dbc:r2dbc-postgresql:0.8.5.RELEASE'
 
-    compileOnly 'org.jetbrains:annotations:20.1.0'
+    compileOnly 'org.jetbrains:annotations:21.0.1'
 }

modules/selenium/build.gradle

@@ -12,6 +12,6 @@ dependencies {
     testCompile project(':nginx')
     testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 
-    compileOnly 'org.jetbrains:annotations:20.1.0'
-    testCompileClasspath 'org.jetbrains:annotations:20.0.0'
+    compileOnly 'org.jetbrains:annotations:21.0.1'
+    testCompileClasspath 'org.jetbrains:annotations:21.0.1'
 }