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

eddumelendez · web-flow · commit 035a826446b0 · 2025-10-06T09:27:56.000-06:00
Combined dependencies PR
diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation project(':testcontainers-jdbc-test')
 
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }
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:26.0.2")
+    api("org.jetbrains:annotations:26.0.2-1")
 
     shaded("org.apache.commons:commons-lang3:3.18.0")
     shaded("commons-io:commons-io:2.20.0")
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.4.1'
 
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }
 
 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:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }
 
 tasks.japicmp {
diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.9.0.25.07'
 
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.9.0.25.07'
 
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }
 
 tasks.japicmp {
diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'io.prestosql:presto-jdbc:350'
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }
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.26.0'
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }
 
 tasks.japicmp {
diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
@@ -14,5 +14,5 @@ dependencies {
     testImplementation 'org.mortbay.jetty:jetty:6.1.26'
     testImplementation project(':testcontainers-nginx')
 
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
@@ -21,7 +21,7 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit'
 
-    testCompileOnly 'org.jetbrains:annotations:26.0.2'
+    testCompileOnly 'org.jetbrains:annotations:26.0.2-1'
 }
 
 tasks.withType(GroovyCompile) {
diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }
diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'io.trino:trino-jdbc:477'
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ dependencies {`
`7`	`7`
`8`	`8`	`testImplementation project(':testcontainers-jdbc-test')`
`9`	`9`
`10`		`- compileOnly 'org.jetbrains:annotations:26.0.2'`
	`10`	`+ compileOnly 'org.jetbrains:annotations:26.0.2-1'`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ dependencies {`
`12`	`12`	`testImplementation testFixtures(project(':testcontainers-r2dbc'))`
`13`	`13`	`testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.4.1'`
`14`	`14`
`15`		`- compileOnly 'org.jetbrains:annotations:26.0.2'`
	`15`	`+ compileOnly 'org.jetbrains:annotations:26.0.2-1'`
`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:26.0.2'`
	`5`	`+ compileOnly 'org.jetbrains:annotations:26.0.2-1'`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`tasks.japicmp {`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ dependencies {`
`5`	`5`
`6`	`6`	`testImplementation project(':testcontainers-jdbc-test')`
`7`	`7`	`testRuntimeOnly 'io.prestosql:presto-jdbc:350'`
`8`		`- compileOnly 'org.jetbrains:annotations:26.0.2'`
	`8`	`+ compileOnly 'org.jetbrains:annotations:26.0.2-1'`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ dependencies {`
`4`	`4`	`api project(":testcontainers")`
`5`	`5`
`6`	`6`	`testImplementation 'com.rabbitmq:amqp-client:5.26.0'`
`7`		`- compileOnly 'org.jetbrains:annotations:26.0.2'`
	`7`	`+ compileOnly 'org.jetbrains:annotations:26.0.2-1'`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`tasks.japicmp {`
Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,5 @@ dependencies {`
`14`	`14`	`testImplementation 'org.mortbay.jetty:jetty:6.1.26'`
`15`	`15`	`testImplementation project(':testcontainers-nginx')`
`16`	`16`
`17`		`- compileOnly 'org.jetbrains:annotations:26.0.2'`
	`17`	`+ compileOnly 'org.jetbrains:annotations:26.0.2-1'`
`18`	`18`	`}`