From 37f5385cf81aedb437c630e4996b7fc0b6cd6290 Mon Sep 17 00:00:00 2001 From: Roy Clarkson Date: Mon, 25 Nov 2019 21:21:47 -0500 Subject: [PATCH] Revert change to remove junit-vintage-engine exclusions See note about exclusion in Spring Boot docs: https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#boot-features-testing --- spring-cloud-app-broker-acceptance-tests/build.gradle | 4 +++- spring-cloud-app-broker-autoconfigure/build.gradle | 4 +++- spring-cloud-app-broker-deployer-cloudfoundry/build.gradle | 4 +++- spring-cloud-app-broker-deployer/build.gradle | 4 +++- spring-cloud-app-broker-integration-tests/build.gradle | 4 +++- spring-cloud-app-broker-security-credhub/build.gradle | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/spring-cloud-app-broker-acceptance-tests/build.gradle b/spring-cloud-app-broker-acceptance-tests/build.gradle index c644ce4..c16cbce 100644 --- a/spring-cloud-app-broker-acceptance-tests/build.gradle +++ b/spring-cloud-app-broker-acceptance-tests/build.gradle @@ -36,7 +36,9 @@ dependencies { implementation project(":spring-cloud-starter-app-broker-cloudfoundry") implementation("org.springframework.boot:spring-boot-starter-webflux") - testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("org.springframework.boot:spring-boot-starter-test") { + exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' + } testImplementation("io.projectreactor:reactor-test") } diff --git a/spring-cloud-app-broker-autoconfigure/build.gradle b/spring-cloud-app-broker-autoconfigure/build.gradle index 4389432..ab4f243 100644 --- a/spring-cloud-app-broker-autoconfigure/build.gradle +++ b/spring-cloud-app-broker-autoconfigure/build.gradle @@ -37,7 +37,9 @@ dependencies { testRuntimeOnly("org.junit.platform:junit-platform-launcher") - testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("org.springframework.boot:spring-boot-starter-test") { + exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' + } testImplementation("io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}") } diff --git a/spring-cloud-app-broker-deployer-cloudfoundry/build.gradle b/spring-cloud-app-broker-deployer-cloudfoundry/build.gradle index 028e25d..b4fc589 100644 --- a/spring-cloud-app-broker-deployer-cloudfoundry/build.gradle +++ b/spring-cloud-app-broker-deployer-cloudfoundry/build.gradle @@ -35,7 +35,9 @@ dependencies { testRuntimeOnly("org.junit.platform:junit-platform-launcher") - testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("org.springframework.boot:spring-boot-starter-test") { + exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' + } testImplementation("io.projectreactor:reactor-test") testImplementation("io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}") } diff --git a/spring-cloud-app-broker-deployer/build.gradle b/spring-cloud-app-broker-deployer/build.gradle index efc5a8b..e7a3cf9 100644 --- a/spring-cloud-app-broker-deployer/build.gradle +++ b/spring-cloud-app-broker-deployer/build.gradle @@ -28,6 +28,8 @@ dependencies { testRuntimeOnly("org.junit.platform:junit-platform-launcher") - testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("org.springframework.boot:spring-boot-starter-test") { + exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' + } testImplementation("io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}") } diff --git a/spring-cloud-app-broker-integration-tests/build.gradle b/spring-cloud-app-broker-integration-tests/build.gradle index 015f1e2..4b8e2c2 100644 --- a/spring-cloud-app-broker-integration-tests/build.gradle +++ b/spring-cloud-app-broker-integration-tests/build.gradle @@ -40,7 +40,9 @@ dependencies { implementation project(":spring-cloud-starter-app-broker-cloudfoundry") implementation("org.springframework.boot:spring-boot-starter-webflux") - testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("org.springframework.boot:spring-boot-starter-test") { + exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' + } 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 528c62d..9f59bb8 100644 --- a/spring-cloud-app-broker-security-credhub/build.gradle +++ b/spring-cloud-app-broker-security-credhub/build.gradle @@ -28,7 +28,9 @@ dependencies { testRuntimeOnly("org.junit.platform:junit-platform-launcher") - testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("org.springframework.boot:spring-boot-starter-test") { + exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' + } testImplementation("io.projectreactor:reactor-test") testImplementation("io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}") }