Browse Source

Upgrade to JUnit 5.0.1 and Tomcat 8.5.23

pull/1540/merge
Juergen Hoeller 7 years ago
parent
commit
3eebdb389b
  1. 8
      build.gradle
  2. 1
      spring-test/spring-test.gradle

8
build.gradle

@ -47,9 +47,9 @@ configure(allprojects) { project ->
ext.hsqldbVersion = "2.4.0" ext.hsqldbVersion = "2.4.0"
ext.jackson2Version = "2.9.1" ext.jackson2Version = "2.9.1"
ext.jettyVersion = "9.4.7.v20170914" ext.jettyVersion = "9.4.7.v20170914"
ext.junitJupiterVersion = "5.0.0" ext.junitJupiterVersion = "5.0.1"
ext.junitPlatformVersion = "1.0.0" ext.junitPlatformVersion = "1.0.1"
ext.junitVintageVersion = "4.12.0" ext.junitVintageVersion = "4.12.1"
ext.kotlinVersion = "1.1.51" ext.kotlinVersion = "1.1.51"
ext.log4jVersion = "2.9.1" ext.log4jVersion = "2.9.1"
ext.nettyVersion = "4.1.16.Final" ext.nettyVersion = "4.1.16.Final"
@ -59,7 +59,7 @@ configure(allprojects) { project ->
ext.rxjava2Version = "2.1.4" ext.rxjava2Version = "2.1.4"
ext.slf4jVersion = "1.7.25" ext.slf4jVersion = "1.7.25"
ext.tiles3Version = "3.0.7" ext.tiles3Version = "3.0.7"
ext.tomcatVersion = "8.5.21" ext.tomcatVersion = "8.5.23"
ext.undertowVersion = "1.4.20.Final" ext.undertowVersion = "1.4.20.Final"
ext.gradleScriptDir = "${rootProject.projectDir}/gradle" ext.gradleScriptDir = "${rootProject.projectDir}/gradle"

1
spring-test/spring-test.gradle

@ -35,6 +35,7 @@ dependencies {
optional("javax.websocket:javax.websocket-api:1.1") optional("javax.websocket:javax.websocket-api:1.1")
optional("junit:junit:4.12") optional("junit:junit:4.12")
optional("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}") optional("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}")
optional("org.apiguardian:apiguardian-api:1.0.0") // for compiling against JUnit 5 without warnings
optional("org.testng:testng:6.12") optional("org.testng:testng:6.12")
optional("org.aspectj:aspectjweaver:${aspectjVersion}") optional("org.aspectj:aspectjweaver:${aspectjVersion}")
optional("org.codehaus.groovy:groovy-all:${groovyVersion}") optional("org.codehaus.groovy:groovy-all:${groovyVersion}")

Loading…
Cancel
Save