Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to JUnit 4.11

Browse Source 
This commit upgrades the compile dependency on JUnit in the spring-test
module as well as the global test dependency on JUnit for the entire
test suite to 4.11 GA.

In addition, the spring-test module now depends on junit:junit instead
of junit:junit-dep since, as of JUnit 4.11, the "junit" Maven artifact
no longer inlines hamcrest-core.

Issue: SPR-10044
This commit is contained in:
Sam Brannen
2012-12-05 11:29:50 +01:00
parent 31dfffde52
commit 2b4ecfad12
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle
View File

@@ -13,8 +13,7 @@ configure(allprojects) {
ext.aspectjVersion = '1.6.12'
ext.easymockVersion = '2.5.2'
ext.hsqldbVersion = '1.8.0.10'
ext.junitVersion = '4.11.20120805.1225' // temporary use of snapshot;
// spring-test still builds against 4.10
ext.junitVersion = '4.11'
ext.slf4jVersion = '1.6.1'
ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
@@ -47,7 +46,8 @@ configure(allprojects) {
configure(subprojects - project(":spring-test")) {
dependencies {
testCompile ("junit:junit-dep:${junitVersion}") {
testCompile ("junit:junit:${junitVersion}") {
// We already have hamcrest-all as a global testCompile dependency.
exclude group: 'org.hamcrest', module: 'hamcrest-core'
}
}
@@ -554,7 +554,7 @@ project('spring-test') {
compile(project(":spring-web"), optional)
compile(project(":spring-webmvc"), optional)
compile(project(":spring-webmvc-portlet"), optional)
compile("junit:junit-dep:4.10") { dep ->
compile("junit:junit:${junitVersion}") { dep ->
optional dep
// We already have hamcrest-all as a global testCompile dependency.
exclude group: 'org.hamcrest', module: 'hamcrest-core'

5
src/dist/changelog.txt vendored
View File

@@ -6,11 +6,12 @@ http://www.springsource.org
Changes in version 3.2 GA (2012-12-12)
--------------------------------------
* upgraded build and test suite to Joda-Time 2.1, Groovy 1.8.8, JRuby 1.6.5, JUnit 4.11
* spring-test module again depends on junit:junit for JUnit 4.11 (10044)
* reworked Hibernate 4 support to avoid reflection, also adding unit tests for Hibernate 4
* upgraded Spring Framework build and test suite to Joda-Time 2.1, Groovy 1.8.8, JRuby 1.6.5
* checked compatibility of Spring's Velocity support with Velocity 1.7 and Velocity Tools 2.0
* checked compatibility of Spring's JasperReports support with JasperReports 5.0
* deprecated Apache iBATIS support in favor of native Spring support in Mybatis
* deprecated Apache iBATIS support in favor of native Spring support in MyBatis
* deprecated BeanReferenceFactoryBean and CommonsLogFactoryBean
* DefaultMessageListenerContainer allows for concurrent subscription consumers on WebLogic/ActiveMQ (SPR-10037)