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

eddumelendez · web-flow · commit da2005b828a8 · 2023-12-12T15:49:46.000-06:00
Combined dependencies PR
diff --git a/build.gradle b/build.gradle
@@ -122,7 +122,7 @@ subprojects {
     }
 
     dependencies {
-        testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+        testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     }
 
     checkstyle {
diff --git a/core/build.gradle b/core/build.gradle
@@ -71,8 +71,8 @@ configurations.all {
 dependencies {
     api 'junit:junit:4.13.2'
     api 'org.slf4j:slf4j-api:1.7.36'
-    compileOnly 'org.jetbrains:annotations:24.0.1'
-    testCompileOnly 'org.jetbrains:annotations:24.0.1'
+    compileOnly 'org.jetbrains:annotations:24.1.0'
+    testCompileOnly 'org.jetbrains:annotations:24.1.0'
     api 'org.apache.commons:commons-compress:1.25.0'
     api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api "io.lettuce:lettuce-core:6.3.0.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
 }
 
 test {
diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'com.hazelcast:hazelcast:5.3.6'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:3.6.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'org.json:json:20231013'
     testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'io.nats:jnats:2.17.1'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
@@ -8,11 +8,11 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:5.0.2'
+    implementation 'redis.clients:jedis:5.1.0'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testng:testng:7.5.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
@@ -8,13 +8,13 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:5.0.2'
+    implementation 'redis.clients:jedis:5.1.0'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'com.jcraft:jsch:0.1.55'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
@@ -8,12 +8,12 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:5.0.2'
+    implementation 'redis.clients:jedis:5.1.0'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
 
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.apache.curator:curator-framework:5.5.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.11.1"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.11.2"
     testImplementation "org.elasticsearch.client:transport:7.17.15"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api(project(":testcontainers"))
     api("org.jetbrains:annotations:24.1.0")
 
-    shaded("org.apache.commons:commons-lang3:3.13.0")
+    shaded("org.apache.commons:commons-lang3:3.14.0")
     shaded("commons-io:commons-io:2.15.1")
     shaded("org.javassist:javassist:3.29.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC"
 dependencies {
     api project(':database-commons')
 
-    compileOnly 'org.jetbrains:annotations:24.0.1'
+    compileOnly 'org.jetbrains:annotations:24.1.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.16'
diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.1'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.24"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.25"
 }
diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.11'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.6.0'
     testFixturesImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'io.trino:trino-jdbc:434'
-    compileOnly 'org.jetbrains:annotations:24.0.1'
+    compileOnly 'org.jetbrains:annotations:24.1.0'
 }
diff --git a/settings.gradle b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.16"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.12"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.12.1"
         classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ subprojects {`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`dependencies {`
`125`		`- testImplementation 'ch.qos.logback:logback-classic:1.3.11'`
	`125`	`+ testImplementation 'ch.qos.logback:logback-classic:1.3.14'`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`checkstyle {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ dependencies {`
`7`	`7`	`api "io.lettuce:lettuce-core:6.3.0.RELEASE"`
`8`	`8`	`testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'`
`9`	`9`	`testImplementation project(":spock")`
`10`		`- testImplementation 'ch.qos.logback:logback-classic:1.3.11'`
	`10`	`+ testImplementation 'ch.qos.logback:logback-classic:1.3.14'`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`test {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ repositories {`
`9`	`9`	`dependencies {`
`10`	`10`	`testImplementation 'org.testcontainers:testcontainers'`
`11`	`11`	`testImplementation 'com.hazelcast:hazelcast:5.3.6'`
`12`		`- testImplementation 'ch.qos.logback:logback-classic:1.3.11'`
	`12`	`+ testImplementation 'ch.qos.logback:logback-classic:1.3.14'`
`13`	`13`	`testImplementation 'org.assertj:assertj-core:3.24.2'`
`14`	`14`	`testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ dependencies {`
`12`	`12`	`testImplementation 'org.testcontainers:junit-jupiter'`
`13`	`13`	`testImplementation 'org.assertj:assertj-core:3.24.2'`
`14`	`14`	`testImplementation 'com.google.guava:guava:23.0'`
`15`		`- testImplementation 'ch.qos.logback:logback-classic:1.3.11'`
	`15`	`+ testImplementation 'ch.qos.logback:logback-classic:1.3.14'`
`16`	`16`	`testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'`
`17`	`17`	`}`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ dependencies {`
`13`	`13`	`testImplementation 'org.apache.kafka:kafka-clients:3.6.1'`
`14`	`14`	`testImplementation 'org.assertj:assertj-core:3.24.2'`
`15`	`15`	`testImplementation 'com.google.guava:guava:23.0'`
`16`		`- testImplementation 'ch.qos.logback:logback-classic:1.3.11'`
	`16`	`+ testImplementation 'ch.qos.logback:logback-classic:1.3.14'`
`17`	`17`	`testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ dependencies {`
`10`	`10`	`implementation 'com.squareup.okhttp3:okhttp:4.12.0'`
`11`	`11`	`implementation 'org.json:json:20231013'`
`12`	`12`	`testRuntimeOnly 'org.postgresql:postgresql:42.7.1'`
`13`		`- testImplementation 'ch.qos.logback:logback-classic:1.3.11'`
	`13`	`+ testImplementation 'ch.qos.logback:logback-classic:1.3.14'`
`14`	`14`	`testImplementation 'org.testcontainers:postgresql'`
`15`	`15`	`testImplementation 'org.assertj:assertj-core:3.24.2'`
`16`	`16`	`}`