From 0e8e3baeeb57a51bcabb74eff5849e8e3f34ea02 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 23 Feb 2022 15:39:20 -0800 Subject: [PATCH] Remove unnecessary testImplementation dependencies (e.g. JUnit, Mockito, etc) from Project (module) Gradle build files. The testImplementation dependencies have been declared in the testDependencies project extension defined in the DependencySetPlugin. The testDependencies have been (implicitly) added to the Project's testImplementation dependencies inside the DependencySetPlugin. --- apache-geode-extensions/apache-geode-extensions.gradle | 8 ++------ .../spring-geode-actuator-autoconfigure.gradle | 8 ++------ spring-geode-actuator/spring-geode-actuator.gradle | 8 ++------ .../spring-geode-autoconfigure.gradle | 8 ++------ spring-geode-cloud/spring-geode-cloud.gradle | 8 ++------ spring-geode-docs/spring-geode-docs.gradle | 6 ++---- .../spring-geode-smoke-tests-multi-store.gradle | 2 +- spring-geode/spring-geode.gradle | 10 +++------- 8 files changed, 16 insertions(+), 42 deletions(-) diff --git a/apache-geode-extensions/apache-geode-extensions.gradle b/apache-geode-extensions/apache-geode-extensions.gradle index b8d5e0b2..25499ab8 100644 --- a/apache-geode-extensions/apache-geode-extensions.gradle +++ b/apache-geode-extensions/apache-geode-extensions.gradle @@ -11,13 +11,9 @@ dependencies { implementation "com.fasterxml.jackson.core:jackson-databind" + // See additional testImplementation dependencies declared in the testDependencies project extension + // defined in the DependencySetPlugin. testImplementation "org.apache.geode:geode-membership:$apacheGeodeVersion" testImplementation "org.apache.geode:geode-serialization:$apacheGeodeVersion" - testImplementation "junit:junit" - testImplementation "org.assertj:assertj-core" - testImplementation "org.mockito:mockito-core" - testImplementation "org.projectlombok:lombok" - testImplementation "edu.umd.cs.mtc:multithreadedtc" - } diff --git a/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle b/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle index f8cbe785..4e71d00c 100644 --- a/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle +++ b/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle @@ -9,12 +9,8 @@ dependencies { compileOnly "com.google.code.findbugs:jsr305:$findbugsVersion" - testImplementation "junit:junit" - testImplementation "org.assertj:assertj-core" - testImplementation "org.mockito:mockito-core" - testImplementation "org.projectlombok:lombok" + // See additional testImplementation dependencies declared in the testDependencies project extension + // defined in the DependencySetPlugin. testImplementation "org.springframework.boot:spring-boot-starter-test" - testImplementation "org.springframework.data:spring-data-geode-test" - testImplementation "edu.umd.cs.mtc:multithreadedtc" } diff --git a/spring-geode-actuator/spring-geode-actuator.gradle b/spring-geode-actuator/spring-geode-actuator.gradle index 8d3c08ac..75e00d21 100644 --- a/spring-geode-actuator/spring-geode-actuator.gradle +++ b/spring-geode-actuator/spring-geode-actuator.gradle @@ -11,12 +11,8 @@ dependencies { provided "org.apache.geode:geode-logging:$apacheGeodeVersion" provided "org.apache.geode:geode-serialization:$apacheGeodeVersion" - testImplementation "junit:junit" - testImplementation "org.assertj:assertj-core" - testImplementation "org.mockito:mockito-core" - testImplementation "org.projectlombok:lombok" + // See additional testImplementation dependencies declared in the testDependencies project extension + // defined in the DependencySetPlugin. testImplementation "org.springframework.boot:spring-boot-starter-test" - testImplementation "org.springframework.data:spring-data-geode-test" - testImplementation "edu.umd.cs.mtc:multithreadedtc" } diff --git a/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle b/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle index 56699f52..d96901d5 100644 --- a/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle +++ b/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle @@ -20,15 +20,11 @@ dependencies { optional "org.springframework.boot:spring-boot-configuration-processor" optional "org.springframework.session:spring-session-data-geode" + // See additional testImplementation dependencies declared in the testDependencies project extension + // defined in the DependencySetPlugin. testImplementation "jakarta.servlet:jakarta.servlet-api" - testImplementation "junit:junit" - testImplementation "org.assertj:assertj-core" - testImplementation "org.mockito:mockito-core" - testImplementation "org.projectlombok:lombok" testImplementation "org.springframework.boot:spring-boot-starter-test" testImplementation "org.springframework.boot:spring-boot-starter-web" - testImplementation "org.springframework.data:spring-data-geode-test" - testImplementation "edu.umd.cs.mtc:multithreadedtc" testCompileOnly "com.google.code.findbugs:jsr305:$findbugsVersion" diff --git a/spring-geode-cloud/spring-geode-cloud.gradle b/spring-geode-cloud/spring-geode-cloud.gradle index 56c92501..ce0bbfb7 100644 --- a/spring-geode-cloud/spring-geode-cloud.gradle +++ b/spring-geode-cloud/spring-geode-cloud.gradle @@ -14,12 +14,8 @@ dependencies { compileOnly "com.google.code.findbugs:jsr305:$findbugsVersion" - testImplementation "junit:junit" - testImplementation "org.assertj:assertj-core" - testImplementation "org.mockito:mockito-core" - testImplementation "org.projectlombok:lombok" + // See additional testImplementation dependencies declared in the testDependencies project extension + // defined in the DependencySetPlugin. testImplementation "org.springframework.boot:spring-boot-starter-test" - testImplementation "org.springframework.data:spring-data-geode-test" - testImplementation "edu.umd.cs.mtc:multithreadedtc" } diff --git a/spring-geode-docs/spring-geode-docs.gradle b/spring-geode-docs/spring-geode-docs.gradle index 9564d7e6..3a008cf0 100644 --- a/spring-geode-docs/spring-geode-docs.gradle +++ b/spring-geode-docs/spring-geode-docs.gradle @@ -22,10 +22,8 @@ dependencies { implementation "org.assertj:assertj-core" implementation "org.projectlombok:lombok" - testImplementation "junit:junit" - testImplementation "org.mockito:mockito-core" - testImplementation "edu.umd.cs.mtc:multithreadedtc" - + // See additional testImplementation dependencies declared in the testDependencies project extension + // defined in the DependencySetPlugin. testImplementation project(":spring-geode-starter-test") } diff --git a/spring-geode-tests/smoke-tests/multi-store/spring-geode-smoke-tests-multi-store.gradle b/spring-geode-tests/smoke-tests/multi-store/spring-geode-smoke-tests-multi-store.gradle index 81bf7a2b..d2dc85d6 100644 --- a/spring-geode-tests/smoke-tests/multi-store/spring-geode-smoke-tests-multi-store.gradle +++ b/spring-geode-tests/smoke-tests/multi-store/spring-geode-smoke-tests-multi-store.gradle @@ -22,6 +22,6 @@ dependencies { exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' } - testImplementation('org.springframework.data:spring-data-geode-test') + testImplementation project(':spring-geode-starter-test') } diff --git a/spring-geode/spring-geode.gradle b/spring-geode/spring-geode.gradle index 21fecbe4..5a9a4981 100644 --- a/spring-geode/spring-geode.gradle +++ b/spring-geode/spring-geode.gradle @@ -21,17 +21,13 @@ dependencies { runtimeOnly "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" - testImplementation "junit:junit" - testImplementation "org.assertj:assertj-core" - testImplementation "org.mockito:mockito-core" - testImplementation "org.projectlombok:lombok" - testImplementation "org.testcontainers:testcontainers" - testImplementation "edu.umd.cs.mtc:multithreadedtc" - + // See additional testImplementation dependencies declared in the testDependencies project extension + // defined in the DependencySetPlugin. testImplementation("org.springframework.boot:spring-boot-starter-test") { exclude group: "org.skyscreamer", module: "jsonassert" } + testImplementation "org.testcontainers:testcontainers" testImplementation "jakarta.persistence:jakarta.persistence-api" testImplementation "org.springframework.boot:spring-boot-starter-data-jpa" testImplementation "org.springframework.boot:spring-boot-starter-data-cassandra"