juni4mock

panchenko · panchenko · commit bfb2bfe4d477 · 2025-06-02T15:17:18.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -132,11 +132,6 @@ subprojects {
 
     dependencies {
         testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-
-        if (project.path != ':testcontainers') {
-            // for compiling classes which extend GenericContainer, etc
-            compileOnly 'junit:junit:4.13.2'
-        }
     }
 
     checkstyle {
diff --git a/core/build.gradle b/core/build.gradle
@@ -69,7 +69,8 @@ configurations.all {
 }
 
 dependencies {
-    implementation 'junit:junit:4.13.2' // originally had api scope
+    // originally was api scope, but that's problematic for projects using junit 5
+    implementation libs.juni4
     api 'org.slf4j:slf4j-api:1.7.36'
     compileOnly 'org.jetbrains:annotations:24.1.0'
     testCompileOnly 'org.jetbrains:annotations:24.1.0'
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,3 @@
+[libraries]
+juni4 = { group = "junit", name = "junit", version = "4.13.2" }
+juni4mock = { group = "io.quarkus", name = "quarkus-junit4-mock", version = "3.23.0" }
diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
@@ -60,6 +60,9 @@ publishing {
                 def apiDeps= project.configurations.api.resolvedConfiguration.firstLevelModuleDependencies
                 def providedDeps = project.configurations.provided.resolvedConfiguration.firstLevelModuleDependencies
                 def newApiDeps = apiDeps - providedDeps
+                def shaded = project.configurations.shaded.resolvedConfiguration.firstLevelModuleDependencies
+                def runtimeDeps = project.configurations.runtimeClasspath.resolvedConfiguration.firstLevelModuleDependencies - apiDeps - providedDeps - shaded
+                println runtimeDeps
 
                 def addDependencies = { Set<ResolvedDependency> resolvedDependencies, scope ->
                     for (dependency in resolvedDependencies) {
@@ -90,6 +93,7 @@ publishing {
                 }
                 addDependencies(newApiDeps, 'compile')
                 addDependencies(providedDeps, 'provided')
+                addDependencies(runtimeDeps, 'runtime')
             }
         }
     }
diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: ActiveMQ"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation "org.apache.activemq:activemq-client:6.1.2"
diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
@@ -3,6 +3,7 @@ description = "Testcontainers :: Azure"
 dependencies {
     api project(':testcontainers')
     api project(':mssqlserver')
+    compileOnly libs.juni4mock
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
diff --git a/modules/chromadb/build.gradle b/modules/chromadb/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: ChromaDB"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
@@ -3,6 +3,7 @@ description = "Testcontainers :: JDBC :: ClickHouse"
 dependencies {
     api project(':testcontainers')
     api project(':jdbc')
+    compileOnly libs.juni4mock
 
     compileOnly project(':r2dbc')
     compileOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.7.2', classifier: 'http')
diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: Consul"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: Couchbase"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: Database-Commons"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: Dynalite (deprecated)"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.772'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.772'
diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
@@ -2,6 +2,8 @@ description = "Testcontainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
+
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.15.1"
     testImplementation "org.elasticsearch.client:transport:7.17.24"
     testImplementation 'org.assertj:assertj-core:3.26.3'
diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: GCloud"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation platform("com.google.cloud:libraries-bom:26.43.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: Grafana"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: InfluxDB"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     compileOnly 'org.influxdb:influxdb-java:2.24'
 
diff --git a/modules/k6/build.gradle b/modules/k6/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: k6"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: Kafka"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
diff --git a/modules/ldap/build.gradle b/modules/ldap/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: LDAP"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.unboundid:unboundid-ldapsdk:7.0.2'
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: Localstack"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.572")
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: Milvus"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.milvus:milvus-sdk-java:2.4.4'
diff --git a/modules/minio/build.gradle b/modules/minio/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: MinIO"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation("io.minio:minio:8.5.12")
     testImplementation 'org.assertj:assertj-core:3.26.3'
diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: MockServer"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation 'org.mock-server:mockserver-client-java:5.15.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: MongoDB"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation("org.mongodb:mongodb-driver-sync:5.1.4")
     testImplementation 'org.assertj:assertj-core:3.26.3'
diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
@@ -2,6 +2,8 @@ description = "Testcontainers :: Nginx"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
+
     compileOnly 'org.jetbrains:annotations:24.1.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
diff --git a/modules/ollama/build.gradle b/modules/ollama/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: Ollama"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
diff --git a/modules/openfga/build.gradle b/modules/openfga/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: OpenFGA"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'dev.openfga:openfga-sdk:0.7.0'
diff --git a/modules/pinecone/build.gradle b/modules/pinecone/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: ActiveMQ"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.pinecone:pinecone-client:3.1.0'
diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: Pulsar"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation platform("org.apache.pulsar:pulsar-bom:3.3.1")
     testImplementation 'org.apache.pulsar:pulsar-client'
diff --git a/modules/qdrant/build.gradle b/modules/qdrant/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: Qdrant"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.qdrant:client:1.10.0'
diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
@@ -3,6 +3,7 @@ description = "Testcontainers :: QuestDB"
 dependencies {
     api project(':testcontainers')
     api project(':jdbc')
+    compileOnly libs.juni4mock
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
     testImplementation project(':jdbc-test')
diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
@@ -7,6 +7,7 @@ description = "Testcontainers :: R2DBC"
 dependencies {
     api project(':testcontainers')
     api 'io.r2dbc:r2dbc-spi:0.9.0.RELEASE'
+    compileOnly libs.juni4mock
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: Redpanda"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
     shaded 'org.freemarker:freemarker:2.3.33'
 
     testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: Selenium"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4
 
     provided 'org.seleniumhq.selenium:selenium-remote-driver:4.10.0'
     provided 'org.seleniumhq.selenium:selenium-chrome-driver:4.10.0'
diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: Solace"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     shaded 'org.awaitility:awaitility:4.2.0'
 
diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: Solr"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
@@ -6,6 +6,7 @@ description = "Testcontainers :: Spock-Extension"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
     implementation 'org.spockframework:spock-core:2.3-groovy-4.0'
 
     testImplementation project(':selenium')
diff --git a/modules/timeplus/build.gradle b/modules/timeplus/build.gradle
@@ -3,6 +3,7 @@ description = "Testcontainers :: JDBC :: Timeplus"
 dependencies {
     api project(':testcontainers')
     api project(':jdbc')
+    compileOnly libs.juni4mock
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'com.timeplus:timeplus-native-jdbc:2.0.5'
diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
@@ -3,6 +3,7 @@ description = "Testcontainers :: Toxiproxy"
 dependencies {
     api project(':testcontainers')
     api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.7'
+    compileOnly libs.juni4mock
 
     testImplementation 'redis.clients:jedis:5.1.5'
     testImplementation 'org.assertj:assertj-core:3.26.3'
diff --git a/modules/typesense/build.gradle b/modules/typesense/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: Typesense"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.typesense:typesense-java:0.9.0'
diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: Vault"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
diff --git a/modules/weaviate/build.gradle b/modules/weaviate/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: Weaviate"
 
 dependencies {
     api project(':testcontainers')
+    compileOnly libs.juni4mock
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.weaviate:client:4.8.3'

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,8 @@ configurations.all {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`dependencies {`
`72`		`- implementation 'junit:junit:4.13.2' // originally had api scope`
	`72`	`+ // originally was api scope, but that's problematic for projects using junit 5`
	`73`	`+ implementation libs.juni4`
`73`	`74`	`api 'org.slf4j:slf4j-api:1.7.36'`
`74`	`75`	`compileOnly 'org.jetbrains:annotations:24.1.0'`
`75`	`76`	`testCompileOnly 'org.jetbrains:annotations:24.1.0'`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[libraries]`
	`2`	`+juni4 = { group = "junit", name = "junit", version = "4.13.2" }`
	`3`	`+juni4mock = { group = "io.quarkus", name = "quarkus-junit4-mock", version = "3.23.0" }`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,9 @@ publishing {`
`60`	`60`	`def apiDeps= project.configurations.api.resolvedConfiguration.firstLevelModuleDependencies`
`61`	`61`	`def providedDeps = project.configurations.provided.resolvedConfiguration.firstLevelModuleDependencies`
`62`	`62`	`def newApiDeps = apiDeps - providedDeps`
	`63`	`+ def shaded = project.configurations.shaded.resolvedConfiguration.firstLevelModuleDependencies`
	`64`	`+ def runtimeDeps = project.configurations.runtimeClasspath.resolvedConfiguration.firstLevelModuleDependencies - apiDeps - providedDeps - shaded`
	`65`	`+ println runtimeDeps`
`63`	`66`
`64`	`67`	`def addDependencies = { Set<ResolvedDependency> resolvedDependencies, scope ->`
`65`	`68`	`for (dependency in resolvedDependencies) {`
`@@ -90,6 +93,7 @@ publishing {`
`90`	`93`	`}`
`91`	`94`	`addDependencies(newApiDeps, 'compile')`
`92`	`95`	`addDependencies(providedDeps, 'provided')`
	`96`	`+ addDependencies(runtimeDeps, 'runtime')`
`93`	`97`	`}`
`94`	`98`	`}`
`95`	`99`	`}`