From 1047e09feed0cf47f1d37b5df55dc1ea5cc50e30 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Tue, 6 Jul 2021 17:22:10 -0500 Subject: [PATCH] Add JUnit 5 Dependencies --- .../io/spring/gradle/convention/DependencySetPlugin.groovy | 7 ++++++- .../dependencyset/gradle/dependency-management.gradle | 6 +++++- .../resources/samples/showcase/sgbcs-api/sgbcs-api.gradle | 2 +- .../samples/showcase/sgbcs-core/sgbcs-core.gradle | 2 +- dependencies/spring-security-dependencies.gradle | 2 ++ 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/DependencySetPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/DependencySetPlugin.groovy index 1cc4048406..be9dcce84c 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/DependencySetPlugin.groovy +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/DependencySetPlugin.groovy @@ -77,7 +77,12 @@ public class DependencySetPlugin implements Plugin { "junit:junit", "org.mockito:mockito-core", "org.springframework:spring-test", - "org.assertj:assertj-core" + "org.assertj:assertj-core", + "org.junit.jupiter:junit-jupiter-api", + "org.junit.jupiter:junit-jupiter-params", + "org.junit.jupiter:junit-jupiter-engine", + "org.mockito:mockito-core", + "org.mockito:mockito-junit-jupiter" ] project.ext.jstlDependencies = [ diff --git a/buildSrc/src/test/resources/samples/dependencyset/gradle/dependency-management.gradle b/buildSrc/src/test/resources/samples/dependencyset/gradle/dependency-management.gradle index 976cb16fe2..5649597c09 100644 --- a/buildSrc/src/test/resources/samples/dependencyset/gradle/dependency-management.gradle +++ b/buildSrc/src/test/resources/samples/dependencyset/gradle/dependency-management.gradle @@ -704,7 +704,11 @@ def deps = [ "xml-apis:xml-apis" : "1.4.01", "xmlunit:xmlunit" : "1.6", "xom:xom" : "1.2.5", - "org.gebish:geb-spock" : "1.1.1" + "org.gebish:geb-spock" : "1.1.1", + "org.junit.jupiter:junit-jupiter-api" : "5.7.2", + "org.junit.jupiter:junit-jupiter-params" : "5.7.2", + "org.junit.jupiter:junit-jupiter-engine" : "5.7.2", + "org.mockito:mockito-junit-jupiter" : "3.11.2" ] configurations.all { diff --git a/buildSrc/src/test/resources/samples/showcase/sgbcs-api/sgbcs-api.gradle b/buildSrc/src/test/resources/samples/showcase/sgbcs-api/sgbcs-api.gradle index a5fd4ea896..cf238daa48 100644 --- a/buildSrc/src/test/resources/samples/showcase/sgbcs-api/sgbcs-api.gradle +++ b/buildSrc/src/test/resources/samples/showcase/sgbcs-api/sgbcs-api.gradle @@ -1,7 +1,7 @@ apply plugin: 'io.spring.convention.spring-module' dependencies { - management platform('io.spring.platform:platform-bom:Brussels-RELEASE') + management platform('org.springframework.boot:spring-boot-dependencies:2.5.2') compile 'org.springframework:spring-web' compile 'org.springframework:spring-core' testCompile 'junit:junit' diff --git a/buildSrc/src/test/resources/samples/showcase/sgbcs-core/sgbcs-core.gradle b/buildSrc/src/test/resources/samples/showcase/sgbcs-core/sgbcs-core.gradle index e5f419b337..d63cbc881b 100644 --- a/buildSrc/src/test/resources/samples/showcase/sgbcs-core/sgbcs-core.gradle +++ b/buildSrc/src/test/resources/samples/showcase/sgbcs-core/sgbcs-core.gradle @@ -1,7 +1,7 @@ apply plugin: 'io.spring.convention.spring-module' dependencies { - management platform('io.spring.platform:platform-bom:Brussels-RELEASE') + management platform('org.springframework.boot:spring-boot-dependencies:2.5.2') optional 'ch.qos.logback:logback-classic' testCompile 'junit:junit' } diff --git a/dependencies/spring-security-dependencies.gradle b/dependencies/spring-security-dependencies.gradle index 6fd9c28830..25eff6c9c5 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -10,6 +10,7 @@ dependencies { api platform("org.springframework:spring-framework-bom:$springFrameworkVersion") api platform("io.projectreactor:reactor-bom:2020.0.7") api platform("io.rsocket:rsocket-bom:1.1.0") + api platform("org.junit:junit-bom:5.7.2") api platform("org.springframework.data:spring-data-bom:2021.0.1") api platform("org.jetbrains.kotlin:kotlin-bom:$kotlinVersion") api platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.0") @@ -57,6 +58,7 @@ dependencies { api "org.jasig.cas.client:cas-client-core:3.6.2" api "org.mockito:mockito-core:3.11.2" api "org.mockito:mockito-inline:3.11.2" + api "org.mockito:mockito-junit-jupiter:3.11.2" api "org.openid4java:openid4java-nodeps:0.9.6" api "org.opensaml:opensaml-core:$openSamlVersion" api "org.opensaml:opensaml-saml-api:$openSamlVersion"