root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Use JUnit 5 Maven BOM in Gradle build 

Issue: SPR-17129
This commit is contained in:
Sam Brannen 2018-08-15 17:43:23 +02:00
parent 109a2b49e5
commit 69e4f21f90
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -34,9 +34,7 @@ ext {
hsqldbVersion = "2.4.1"
jackson2Version = "2.9.6"
jettyVersion = "9.4.12.RC1"
junitPlatformVersion = "1.3.0-RC1"
junitJupiterVersion = "5.3.0-RC1"
junitVintageVersion = "5.3.0-RC1"
junit5Version = '5.3.0-RC1'
kotlinVersion = "1.2.60"
log4jVersion = "2.11.1"
nettyVersion = "4.1.28.Final"
@ -154,7 +152,7 @@ configure(allprojects) { project ->
}
dependencies {
testCompile("junit:junit:4.12") {
testCompile('junit:junit:4.12') {
exclude group:'org.hamcrest', module:'hamcrest-core'
}
testCompile("org.mockito:mockito-core:2.21.0") {

15
spring-test/spring-test.gradle
View File

@ -2,6 +2,7 @@ description = "Spring TestContext Framework"
dependencyManagement {
imports {
mavenBom "org.junit:junit-bom:${junit5Version}"
mavenBom "io.projectreactor:reactor-bom:${reactorVersion}"
mavenBom "io.netty:netty-bom:${nettyVersion}"
}
@ -27,8 +28,8 @@ dependencies {
optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
optional("javax.xml.bind:jaxb-api:2.3.0")
optional("javax.websocket:javax.websocket-api:1.1")
optional("junit:junit:4.12")
optional("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}")
optional('junit:junit:4.12')
optional('org.junit.jupiter:junit-jupiter-api')
optional("org.testng:testng:6.14.3")
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
@ -62,8 +63,8 @@ dependencies {
testCompile("org.hibernate:hibernate-core:5.2.17.Final")
testCompile("org.hibernate:hibernate-validator:6.0.12.Final")
// Enable use of the JUnit Platform Runner
testCompile("org.junit.platform:junit-platform-runner:${junitPlatformVersion}")
testCompile("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}")
testCompile('org.junit.platform:junit-platform-runner')
testCompile('org.junit.jupiter:junit-jupiter-params')
testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
testCompile("com.thoughtworks.xstream:xstream:1.4.10")
testCompile("com.rometools:rome:1.11.0")
@ -78,9 +79,9 @@ dependencies {
testCompile('de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1')
// Pull in the latest JUnit 5 Launcher API and the Vintage engine as well
// so that we can run JUnit 4 tests in IntelliJ IDEA.
testRuntime("org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}")
testRuntime("org.junit.platform:junit-platform-launcher:${junitPlatformVersion}")
testRuntime("org.junit.vintage:junit-vintage-engine:${junitVintageVersion}")
testRuntime('org.junit.jupiter:junit-jupiter-engine')
testRuntime('org.junit.platform:junit-platform-launcher')
testRuntime('org.junit.vintage:junit-vintage-engine')
testRuntime("org.glassfish:javax.el:3.0.1-b08")
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1")
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1")