Browse Source

Upgrade to JUnit Jupiter 5.3 RC1 (and Jetty 9.4.12 RC1)

Includes Groovy 2.5.2, Undertow 2.0.12, Hibernate Validator 6.0.12.

Issue: SPR-17129
pull/1929/head
Juergen Hoeller 8 years ago
parent
commit
de38af6843
  1. 12
      build.gradle
  2. 2
      spring-context-support/spring-context-support.gradle
  3. 2
      spring-test/spring-test.gradle
  4. 2
      spring-webflux/spring-webflux.gradle
  5. 2
      spring-webmvc/spring-webmvc.gradle

12
build.gradle

@ -30,13 +30,13 @@ ext {
aspectjVersion = "1.9.1" aspectjVersion = "1.9.1"
freemarkerVersion = "2.3.28" freemarkerVersion = "2.3.28"
groovyVersion = "2.5.1" groovyVersion = "2.5.2"
hsqldbVersion = "2.4.1" hsqldbVersion = "2.4.1"
jackson2Version = "2.9.6" jackson2Version = "2.9.6"
jettyVersion = "9.4.11.v20180605" jettyVersion = "9.4.12.RC1"
junitPlatformVersion = "1.2.0" junitPlatformVersion = "1.3.0-RC1"
junitJupiterVersion = "5.2.0" junitJupiterVersion = "5.3.0-RC1"
junitVintageVersion = "5.2.0" junitVintageVersion = "5.3.0-RC1"
kotlinVersion = "1.2.60" kotlinVersion = "1.2.60"
log4jVersion = "2.11.1" log4jVersion = "2.11.1"
nettyVersion = "4.1.28.Final" nettyVersion = "4.1.28.Final"
@ -47,7 +47,7 @@ ext {
slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
tiles3Version = "3.0.8" tiles3Version = "3.0.8"
tomcatVersion = "9.0.10" tomcatVersion = "9.0.10"
undertowVersion = "2.0.11.Final" undertowVersion = "2.0.12.Final"
gradleScriptDir = "${rootProject.projectDir}/gradle" gradleScriptDir = "${rootProject.projectDir}/gradle"
withoutJclOverSlf4J = { withoutJclOverSlf4J = {

2
spring-context-support/spring-context-support.gradle

@ -16,7 +16,7 @@ dependencies {
optional("org.freemarker:freemarker:${freemarkerVersion}") optional("org.freemarker:freemarker:${freemarkerVersion}")
testCompile(project(":spring-context")) testCompile(project(":spring-context"))
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile("org.hibernate:hibernate-validator:6.0.11.Final") testCompile("org.hibernate:hibernate-validator:6.0.12.Final")
testCompile("javax.annotation:javax.annotation-api:1.3.2") testCompile("javax.annotation:javax.annotation-api:1.3.2")
testRuntime("org.ehcache:jcache:1.0.1") testRuntime("org.ehcache:jcache:1.0.1")
testRuntime("org.ehcache:ehcache:3.4.0") testRuntime("org.ehcache:ehcache:3.4.0")

2
spring-test/spring-test.gradle

@ -60,7 +60,7 @@ dependencies {
testCompile("javax.interceptor:javax.interceptor-api:1.2.2") testCompile("javax.interceptor:javax.interceptor-api:1.2.2")
testCompile("javax.mail:javax.mail-api:1.6.1") testCompile("javax.mail:javax.mail-api:1.6.1")
testCompile("org.hibernate:hibernate-core:5.2.17.Final") testCompile("org.hibernate:hibernate-core:5.2.17.Final")
testCompile("org.hibernate:hibernate-validator:6.0.11.Final") testCompile("org.hibernate:hibernate-validator:6.0.12.Final")
// Enable use of the JUnit Platform Runner // Enable use of the JUnit Platform Runner
testCompile("org.junit.platform:junit-platform-runner:${junitPlatformVersion}") testCompile("org.junit.platform:junit-platform-runner:${junitPlatformVersion}")
testCompile("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}") testCompile("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}")

2
spring-webflux/spring-webflux.gradle

@ -41,7 +41,7 @@ dependencies {
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
optional("com.google.protobuf:protobuf-java-util:3.6.1") optional("com.google.protobuf:protobuf-java-util:3.6.1")
testCompile("javax.xml.bind:jaxb-api:2.3.0") testCompile("javax.xml.bind:jaxb-api:2.3.0")
testCompile("org.hibernate:hibernate-validator:6.0.11.Final") testCompile("org.hibernate:hibernate-validator:6.0.12.Final")
testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}" testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}"
testCompile("io.projectreactor:reactor-test") testCompile("io.projectreactor:reactor-test")
testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}") testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}")

2
spring-webmvc/spring-webmvc.gradle

@ -50,7 +50,7 @@ dependencies {
testCompile("org.eclipse.jetty:jetty-server") { testCompile("org.eclipse.jetty:jetty-server") {
exclude group: "javax.servlet", module: "javax.servlet" exclude group: "javax.servlet", module: "javax.servlet"
} }
testCompile("org.hibernate:hibernate-validator:6.0.11.Final") testCompile("org.hibernate:hibernate-validator:6.0.12.Final")
testCompile("org.apache.httpcomponents:httpclient:4.5.6") { testCompile("org.apache.httpcomponents:httpclient:4.5.6") {
exclude group: "commons-logging", module: "commons-logging" exclude group: "commons-logging", module: "commons-logging"
} }

Loading…
Cancel
Save