From f3f34fc63aad532c10148cb7f1dda9b9ad63ae84 Mon Sep 17 00:00:00 2001 From: Roy Clarkson Date: Thu, 21 Nov 2019 10:13:54 -0500 Subject: [PATCH] Clean up test dependencies --- .../build.gradle | 19 ++++++------------- .../build.gradle | 7 +------ .../build.gradle | 7 +------ spring-cloud-app-broker-deployer/build.gradle | 5 +---- .../build.gradle | 8 +++----- .../build.gradle | 4 +--- 6 files changed, 13 insertions(+), 37 deletions(-) diff --git a/spring-cloud-app-broker-acceptance-tests/build.gradle b/spring-cloud-app-broker-acceptance-tests/build.gradle index d4c8766..c644ce4 100644 --- a/spring-cloud-app-broker-acceptance-tests/build.gradle +++ b/spring-cloud-app-broker-acceptance-tests/build.gradle @@ -33,18 +33,11 @@ configurations.archives.artifacts.clear() apply plugin: 'org.springframework.boot' dependencies { - compile project(":spring-cloud-starter-app-broker-cloudfoundry") - compile("org.springframework.boot:spring-boot-starter-webflux") + implementation project(":spring-cloud-starter-app-broker-cloudfoundry") + implementation("org.springframework.boot:spring-boot-starter-webflux") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") - - testCompile("org.junit.jupiter:junit-jupiter-api") - testImplementation("org.springframework.boot:spring-boot-starter-test") { - exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' - } - - testCompile("io.projectreactor:reactor-test") - testCompile("org.assertj:assertj-core") + testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("io.projectreactor:reactor-test") } // build the test broker from /src into a jar that the tests can deploy @@ -52,10 +45,10 @@ test.dependsOn assemble // omit the version from the test broker jar file jar { - version = '' + archiveVersion = '' } bootJar { - version = '' + archiveVersion = '' } test { diff --git a/spring-cloud-app-broker-autoconfigure/build.gradle b/spring-cloud-app-broker-autoconfigure/build.gradle index 7668f69..4389432 100644 --- a/spring-cloud-app-broker-autoconfigure/build.gradle +++ b/spring-cloud-app-broker-autoconfigure/build.gradle @@ -37,13 +37,8 @@ dependencies { testRuntimeOnly("org.junit.platform:junit-platform-launcher") - testImplementation("org.springframework.boot:spring-boot-starter-test") { - exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' - } + testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}") - testCompileOnly("org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}") - testCompileOnly("org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}") - testCompileOnly("org.springframework.credhub:spring-credhub-starter:${springCredhubVersion}") } compileJava.dependsOn(processResources) diff --git a/spring-cloud-app-broker-deployer-cloudfoundry/build.gradle b/spring-cloud-app-broker-deployer-cloudfoundry/build.gradle index c1151e4..028e25d 100644 --- a/spring-cloud-app-broker-deployer-cloudfoundry/build.gradle +++ b/spring-cloud-app-broker-deployer-cloudfoundry/build.gradle @@ -33,14 +33,9 @@ dependencies { compile("org.springframework.boot:spring-boot-starter-validation") compile("org.immutables:value:${immutablesVersion}") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") testRuntimeOnly("org.junit.platform:junit-platform-launcher") - testImplementation("org.springframework:spring-test") + testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("io.projectreactor:reactor-test") testImplementation("io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}") - testImplementation("org.junit.jupiter:junit-jupiter-api") - testImplementation("org.assertj:assertj-core") - testImplementation("org.mockito:mockito-core") - testImplementation("org.mockito:mockito-junit-jupiter") } diff --git a/spring-cloud-app-broker-deployer/build.gradle b/spring-cloud-app-broker-deployer/build.gradle index 29f08a9..efc5a8b 100644 --- a/spring-cloud-app-broker-deployer/build.gradle +++ b/spring-cloud-app-broker-deployer/build.gradle @@ -26,11 +26,8 @@ dependencies { compile("org.springframework:spring-core") compile("io.projectreactor:reactor-core") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") testRuntimeOnly("org.junit.platform:junit-platform-launcher") + testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}") - - testCompile("org.junit.jupiter:junit-jupiter-api") - testCompile("org.assertj:assertj-core") } diff --git a/spring-cloud-app-broker-integration-tests/build.gradle b/spring-cloud-app-broker-integration-tests/build.gradle index 4851d26..015f1e2 100644 --- a/spring-cloud-app-broker-integration-tests/build.gradle +++ b/spring-cloud-app-broker-integration-tests/build.gradle @@ -37,12 +37,10 @@ ext { apply plugin: 'org.springframework.boot' dependencies { - compile project(":spring-cloud-starter-app-broker-cloudfoundry") - compile("org.springframework.boot:spring-boot-starter-webflux") + implementation project(":spring-cloud-starter-app-broker-cloudfoundry") + implementation("org.springframework.boot:spring-boot-starter-webflux") - testImplementation("org.springframework.boot:spring-boot-starter-test") { - exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' - } + testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("io.rest-assured:rest-assured") testImplementation("com.github.tomakehurst:wiremock:${wiremockVersion}") } diff --git a/spring-cloud-app-broker-security-credhub/build.gradle b/spring-cloud-app-broker-security-credhub/build.gradle index 9f59bb8..528c62d 100644 --- a/spring-cloud-app-broker-security-credhub/build.gradle +++ b/spring-cloud-app-broker-security-credhub/build.gradle @@ -28,9 +28,7 @@ dependencies { testRuntimeOnly("org.junit.platform:junit-platform-launcher") - testImplementation("org.springframework.boot:spring-boot-starter-test") { - exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' - } + testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("io.projectreactor:reactor-test") testImplementation("io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}") }