Merge branch 'main' into feat/mysql-r2dbc-helper

papa-piton-2256 · web-flow · commit a07ff1420cca · 2025-12-09T14:28:15.000-06:00
diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api project(':testcontainers-mssqlserver')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:5.1.0'
+    shaded 'com.squareup.okhttp3:okhttp:5.3.2'
 
     testImplementation platform("com.azure:azure-sdk-bom:1.2.32")
     testImplementation 'com.azure:azure-cosmos'
diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Couchbase"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:5.1.0'
+    shaded 'com.squareup.okhttp3:okhttp:5.3.2'
 
     testImplementation 'com.couchbase.client:java-client:3.9.1'
     testImplementation 'org.awaitility:awaitility:4.3.0'
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     api 'org.apache.tomcat:tomcat-jdbc:11.0.14'
     api 'org.vibur:vibur-dbcp:26.0'
     api 'com.mysql:mysql-connector-j:9.5.0'
-    api 'org.junit.jupiter:junit-jupiter:5.13.4'
+    api 'org.junit.jupiter:junit-jupiter:5.14.1'
 }
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
@@ -2,18 +2,18 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    implementation platform('org.junit:junit-bom:5.13.4')
+    implementation platform('org.junit:junit-bom:5.14.1')
     implementation 'org.junit.jupiter:junit-jupiter-api'
 
     testImplementation project(':testcontainers-mysql')
     testImplementation project(':testcontainers-postgresql')
     testImplementation 'com.zaxxer:HikariCP:7.0.2'
-    testImplementation 'redis.clients:jedis:6.2.0'
+    testImplementation 'redis.clients:jedis:7.1.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
     }
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
-    testRuntimeOnly 'com.mysql:mysql-connector-j:8.2.0'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:9.5.0'
 }
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'io.asyncer:r2dbc-mysql:1.4.1'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'com.mysql:mysql-connector-j:8.2.0'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:9.5.0'
 
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.4.1'
diff --git a/modules/oceanbase/build.gradle b/modules/oceanbase/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'com.mysql:mysql-connector-j:8.2.0'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:9.5.0'
 }
diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.44"
+    api "com.orientechnologies:orientdb-client:3.2.46"
 
-    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.4'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.44"
+    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.8.0'
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.46"
 }
diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
@@ -13,5 +13,5 @@ dependencies {
 
     testFixturesImplementation 'io.projectreactor:reactor-core:3.7.11'
     testFixturesImplementation 'org.assertj:assertj-core:3.27.6'
-    testFixturesImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
+    testFixturesImplementation 'org.junit.jupiter:junit-jupiter:5.14.1'
 }
diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Solr"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:5.1.0'
+    shaded 'com.squareup.okhttp3:okhttp:5.3.2'
 
     testImplementation 'org.apache.solr:solr-solrj:8.11.4'
 }
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
@@ -16,8 +16,8 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
-    testRuntimeOnly 'com.mysql:mysql-connector-j:8.2.0'
-    testRuntimeOnly platform('org.junit:junit-bom:5.13.4')
+    testRuntimeOnly 'com.mysql:mysql-connector-j:9.5.0'
+    testRuntimeOnly platform('org.junit:junit-bom:5.14.1')
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit'
 
diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'com.mysql:mysql-connector-j:8.2.0'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:9.5.0'
     compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ dependencies {`
`11`	`11`	`api 'org.apache.tomcat:tomcat-jdbc:11.0.14'`
`12`	`12`	`api 'org.vibur:vibur-dbcp:26.0'`
`13`	`13`	`api 'com.mysql:mysql-connector-j:9.5.0'`
`14`		`- api 'org.junit.jupiter:junit-jupiter:5.13.4'`
	`14`	`+ api 'org.junit.jupiter:junit-jupiter:5.14.1'`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@ dependencies {`
`4`	`4`	`api project(':testcontainers-jdbc')`
`5`	`5`
`6`	`6`	`testImplementation project(':testcontainers-jdbc-test')`
`7`		`- testRuntimeOnly 'com.mysql:mysql-connector-j:8.2.0'`
	`7`	`+ testRuntimeOnly 'com.mysql:mysql-connector-j:9.5.0'`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ dependencies {`
`13`	`13`
`14`	`14`	`testFixturesImplementation 'io.projectreactor:reactor-core:3.7.11'`
`15`	`15`	`testFixturesImplementation 'org.assertj:assertj-core:3.27.6'`
`16`		`- testFixturesImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'`
	`16`	`+ testFixturesImplementation 'org.junit.jupiter:junit-jupiter:5.14.1'`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ description = "Testcontainers :: Solr"`
`3`	`3`	`dependencies {`
`4`	`4`	`api project(':testcontainers')`
`5`	`5`	`// TODO use JDK's HTTP client and/or Apache HttpClient5`
`6`		`- shaded 'com.squareup.okhttp3:okhttp:5.1.0'`
	`6`	`+ shaded 'com.squareup.okhttp3:okhttp:5.3.2'`
`7`	`7`
`8`	`8`	`testImplementation 'org.apache.solr:solr-solrj:8.11.4'`
`9`	`9`	`}`