Browse Source

Add JUnit 5 Dependencies

Rob Winch 4 years ago
parent
commit
1047e09fee

+ 6 - 1
buildSrc/src/main/groovy/io/spring/gradle/convention/DependencySetPlugin.groovy

@@ -77,7 +77,12 @@ public class DependencySetPlugin implements Plugin<Project> {
 			"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 = [

+ 5 - 1
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 {

+ 1 - 1
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'

+ 1 - 1
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'
 }

+ 2 - 0
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"