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

eddumelendez · web-flow · commit e886af4e92ba · 2025-07-09T12:11:57.000-06:00
Combined dependencies PR
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.1.0'
-    testCompileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
+    testCompileOnly 'org.jetbrains:annotations:26.0.2'
     api 'org.apache.commons:commons-compress:1.24.0'
     api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')
diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
 
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
 }
diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: HiveMQ"
 
 dependencies {
     api(project(":testcontainers"))
-    api("org.jetbrains:annotations:24.1.0")
+    api("org.jetbrains:annotations:26.0.2")
 
     shaded("org.apache.commons:commons-lang3:3.17.0")
     shaded("commons-io:commons-io:2.17.0")
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.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.30'
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.3.0'
 
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
 }
 
 tasks.japicmp {
diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: Nginx"
 
 dependencies {
     api project(':testcontainers')
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 
diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation project(':jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.5.0.24.07'
 
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
 
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation project(':jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.5.0.24.07'
 
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
 
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
 }
 
 tasks.japicmp {
diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'io.prestosql:presto-jdbc:350'
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
 }
diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(":testcontainers")
     testImplementation 'com.rabbitmq:amqp-client:5.22.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
 }
 
 tasks.japicmp {
diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
@@ -15,5 +15,5 @@ dependencies {
     testImplementation project(':nginx')
     testImplementation 'org.assertj:assertj-core:3.27.3'
 
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
 }
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.11.0'
 
-    testCompileOnly 'org.jetbrains:annotations:24.1.0'
+    testCompileOnly 'org.jetbrains:annotations:26.0.2'
 }
 
 tasks.withType(GroovyCompile) {
diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.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:458'
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
 }

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ dependencies {`
`6`	`6`	`testImplementation project(':jdbc-test')`
`7`	`7`	`testRuntimeOnly 'org.postgresql:postgresql:42.7.4'`
`8`	`8`
`9`		`- compileOnly 'org.jetbrains:annotations:24.1.0'`
	`9`	`+ compileOnly 'org.jetbrains:annotations:26.0.2'`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ dependencies {`
`12`	`12`	`testImplementation testFixtures(project(':r2dbc'))`
`13`	`13`	`testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.3.0'`
`14`	`14`
`15`		`- compileOnly 'org.jetbrains:annotations:24.1.0'`
	`15`	`+ compileOnly 'org.jetbrains:annotations:26.0.2'`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`tasks.japicmp {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ description = "Testcontainers :: Nginx"`
`2`	`2`
`3`	`3`	`dependencies {`
`4`	`4`	`api project(':testcontainers')`
`5`		`- compileOnly 'org.jetbrains:annotations:24.1.0'`
	`5`	`+ compileOnly 'org.jetbrains:annotations:26.0.2'`
`6`	`6`	`testImplementation 'org.assertj:assertj-core:3.27.3'`
`7`	`7`	`}`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ dependencies {`
`5`	`5`
`6`	`6`	`testImplementation project(':jdbc-test')`
`7`	`7`	`testRuntimeOnly 'io.prestosql:presto-jdbc:350'`
`8`		`- compileOnly 'org.jetbrains:annotations:24.1.0'`
	`8`	`+ compileOnly 'org.jetbrains:annotations:26.0.2'`
`9`	`9`	`}`