consolidate test dependencies for logging

hankem · codecholeric · commit 320e3dc438a0 · 2024-06-09T23:37:06.000+02:00
To provide an SLF4J implementation to all tests, `dependency.log4j_slf4j`
(with the implementation of `org.apache.logging.slf4j.SLF4JServiceProvider` picked up at runtime by the ServiceLoader)
is moved to the `archunit.java-testing-conventions` plugin.
It transitively depends on `dependency.log4j_core` / `dependency.log4j_api`,
which are only needed as explicit implementation dependencies in modules that specifically test logs.

Signed-off-by: Manfred Hanke &lt;Manfred.Hanke@tngtech.com&gt;
diff --git a/archunit-3rd-party-test/build.gradle b/archunit-3rd-party-test/build.gradle
@@ -9,7 +9,6 @@ dependencies {
     testImplementation project(path: ':archunit', configuration: 'tests')
     testImplementation dependency.springBootLoader
     dependency.addGuava { dependencyNotation, config -> testImplementation(dependencyNotation, config) }
-    testImplementation dependency.log4j_slf4j
     testImplementation dependency.junit4
     testImplementation dependency.junit_dataprovider
     testImplementation dependency.assertj
diff --git a/archunit-example/example-junit4/build.gradle b/archunit-example/example-junit4/build.gradle
@@ -7,10 +7,6 @@ ext.moduleName = 'com.tngtech.archunit.example.junit4'
 dependencies {
     testImplementation project(path: ':archunit-junit4')
     testImplementation project(path: ':archunit-example:example-plain')
-
-    testRuntimeOnly dependency.log4j_api
-    testRuntimeOnly dependency.log4j_core
-    testRuntimeOnly dependency.log4j_slf4j
 }
 
 test {
diff --git a/archunit-example/example-junit5/build.gradle b/archunit-example/example-junit5/build.gradle
@@ -8,10 +8,6 @@ ext.minimumJavaVersion = JavaVersion.VERSION_1_8
 dependencies {
     testImplementation project(path: ':archunit-junit5')
     testImplementation project(path: ':archunit-example:example-plain')
-
-    testRuntimeOnly dependency.log4j_api
-    testRuntimeOnly dependency.log4j_core
-    testRuntimeOnly dependency.log4j_slf4j
 }
 
 test {
diff --git a/archunit-integration-test/build.gradle b/archunit-integration-test/build.gradle
@@ -9,9 +9,6 @@ ext.minimumJavaVersion = JavaVersion.VERSION_1_8
 dependencies {
     testImplementation dependency.junitPlatform
     testImplementation dependency.assertj
-    testImplementation dependency.log4j_api
-    testImplementation dependency.log4j_core
-    testImplementation dependency.log4j_slf4j
     testImplementation project(path: ':archunit', configuration: 'tests')
     testImplementation project(path: ':archunit-junit4')
     testImplementation project(path: ':archunit-junit5-api')
diff --git a/archunit-java-modules-test/build.gradle b/archunit-java-modules-test/build.gradle
@@ -9,7 +9,6 @@ ext.minimumJavaVersion = JavaVersion.VERSION_1_9
 
 dependencies {
     testImplementation project(path: ':archunit', configuration: 'shadow')
-    testImplementation dependency.log4j_slf4j
 }
 
 def addArchUnitModuleOptions = {
diff --git a/archunit-junit/build.gradle b/archunit-junit/build.gradle
@@ -38,9 +38,6 @@ dependencies {
     dependency.addGuava { dependencyNotation, config -> implementation(dependencyNotation, config) }
     implementation dependency.slf4j
 
-    testImplementation dependency.log4j_api
-    testImplementation dependency.log4j_core
-    testImplementation dependency.log4j_slf4j
     testImplementation dependency.junit4
     testImplementation dependency.junit_dataprovider
     testImplementation dependency.mockito
diff --git a/archunit-junit/junit4/build.gradle b/archunit-junit/junit4/build.gradle
@@ -12,9 +12,6 @@ dependencies {
     dependency.addGuava { dependencyNotation, config -> implementation(dependencyNotation, config) }
     implementation dependency.slf4j
 
-    testImplementation dependency.log4j_api
-    testImplementation dependency.log4j_core
-    testImplementation dependency.log4j_slf4j
     testImplementation dependency.junit4
     testImplementation dependency.junit_dataprovider
     testImplementation dependency.mockito
diff --git a/archunit-junit/junit5/engine/build.gradle b/archunit-junit/junit5/engine/build.gradle
@@ -19,7 +19,6 @@ dependencies {
     testImplementation dependency.mockito
     testImplementation dependency.mockito_junit5
     testImplementation dependency.log4j_core
-    testImplementation dependency.log4j_slf4j
 }
 
 gradle.projectsEvaluated {
diff --git a/archunit/build.gradle b/archunit/build.gradle
@@ -11,7 +11,6 @@ dependencies {
 
     testImplementation dependency.log4j_api
     testImplementation dependency.log4j_core
-    testImplementation dependency.log4j_slf4j
     testImplementation dependency.junit4
     testImplementation dependency.junit_dataprovider
     testImplementation dependency.mockito
diff --git a/buildSrc/src/main/groovy/archunit.java-testing-conventions.gradle b/buildSrc/src/main/groovy/archunit.java-testing-conventions.gradle
@@ -13,6 +13,7 @@ dependencies {
 
     testRuntimeOnly dependency.junit5JupiterEngine
     testRuntimeOnly dependency.junit5VintageEngine
+    testRuntimeOnly dependency.log4j_slf4j
 }
 
 tasks.withType(Test) {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ ext.minimumJavaVersion = JavaVersion.VERSION_1_9`
`9`	`9`
`10`	`10`	`dependencies {`
`11`	`11`	`testImplementation project(path: ':archunit', configuration: 'shadow')`
`12`		`- testImplementation dependency.log4j_slf4j`
`13`	`12`	`}`
`14`	`13`
`15`	`14`	`def addArchUnitModuleOptions = {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ dependencies {`
`19`	`19`	`testImplementation dependency.mockito`
`20`	`20`	`testImplementation dependency.mockito_junit5`
`21`	`21`	`testImplementation dependency.log4j_core`
`22`		`- testImplementation dependency.log4j_slf4j`
`23`	`22`	`}`
`24`	`23`
`25`	`24`	`gradle.projectsEvaluated {`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ dependencies {`
`13`	`13`
`14`	`14`	`testRuntimeOnly dependency.junit5JupiterEngine`
`15`	`15`	`testRuntimeOnly dependency.junit5VintageEngine`
	`16`	`+ testRuntimeOnly dependency.log4j_slf4j`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`tasks.withType(Test) {`