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

Upgrade to JUnit 5.0 M4 

Issue: SPR-15361
This commit is contained in:
Sam Brannen 2017-04-01 22:55:24 +02:00
parent 73b44828e9
commit ce21fa4152
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -70,8 +70,8 @@ configure(allprojects) { project ->
ext.jspVersion = "2.3.2-b02" ext.jspVersion = "2.3.2-b02"
ext.jtaVersion = "1.2" ext.jtaVersion = "1.2"
ext.junitVersion = "4.12" ext.junitVersion = "4.12"
ext.junitJupiterVersion = '5.0.0-M3' ext.junitJupiterVersion = '5.0.0-M4'
ext.junitPlatformVersion = '1.0.0-M3' ext.junitPlatformVersion = '1.0.0-M4'
ext.kotlinVersion = "1.1.1" // also change kotlin-gradle-plugin version when upgrading ext.kotlinVersion = "1.1.1" // also change kotlin-gradle-plugin version when upgrading
ext.log4jVersion = '2.8.1' ext.log4jVersion = '2.8.1'
ext.nettyVersion = "4.1.9.Final" ext.nettyVersion = "4.1.9.Final"

10
spring-test/src/test/java/org/springframework/test/context/junit/SpringJUnitJupiterTestSuite.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,11 +16,11 @@
package org.springframework.test.context.junit; package org.springframework.test.context.junit;
import org.junit.platform.runner.IncludeClassNamePatterns;
import org.junit.platform.runner.IncludeEngines;
import org.junit.platform.runner.JUnitPlatform; import org.junit.platform.runner.JUnitPlatform;
import org.junit.platform.runner.SelectPackages; import org.junit.platform.suite.api.IncludeClassNamePatterns;
import org.junit.platform.runner.UseTechnicalNames; import org.junit.platform.suite.api.IncludeEngines;
import org.junit.platform.suite.api.SelectPackages;
import org.junit.platform.suite.api.UseTechnicalNames;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
/** /**