From 2b4ecfad12ad1be0c5ad28943696601956883ce6 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Wed, 5 Dec 2012 11:29:50 +0100 Subject: [PATCH] Upgrade to JUnit 4.11 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 --- build.gradle | 8 ++++---- src/dist/changelog.txt | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 13feca1042..a5a5604eb7 100644 --- a/build.gradle +++ b/build.gradle @@ -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' diff --git a/src/dist/changelog.txt b/src/dist/changelog.txt index 22bb478216..17dc988245 100644 --- a/src/dist/changelog.txt +++ b/src/dist/changelog.txt @@ -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)