From 87dad65ff00c9fc3eed4c918edb50be0232e2fba Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Thu, 18 Aug 2011 16:06:31 +0000 Subject: [PATCH] [SPR-8622] Upgraded to JUnit 4.8.2 --- build-spring-framework/resources/changelog.txt | 1 + build.versions | 2 +- org.springframework.aop/.classpath | 2 +- org.springframework.aspects/.classpath | 2 +- org.springframework.beans/.classpath | 2 +- org.springframework.context.support/.classpath | 2 +- org.springframework.context/.classpath | 2 +- org.springframework.core/.classpath | 2 +- org.springframework.expression/.classpath | 2 +- org.springframework.integration-tests/.classpath | 2 +- org.springframework.jdbc/.classpath | 2 +- org.springframework.jms/.classpath | 2 +- org.springframework.orm/.classpath | 2 +- org.springframework.oxm/.classpath | 2 +- org.springframework.spring-parent/pom.xml | 2 +- org.springframework.test/.classpath | 2 +- org.springframework.test/test.iml | 4 ++-- org.springframework.transaction/.classpath | 2 +- org.springframework.web.portlet/.classpath | 2 +- org.springframework.web.servlet/.classpath | 2 +- org.springframework.web.struts/.classpath | 2 +- org.springframework.web/.classpath | 2 +- 22 files changed, 23 insertions(+), 22 deletions(-) diff --git a/build-spring-framework/resources/changelog.txt b/build-spring-framework/resources/changelog.txt index 59c8f4b563..4bf993674e 100644 --- a/build-spring-framework/resources/changelog.txt +++ b/build-spring-framework/resources/changelog.txt @@ -10,6 +10,7 @@ Changes in version 3.1 RC1 (2011-09-xx) * updated JBossLoadTimeWeaver to automatically detect and support JBoss AS 7 as well * support for load-time weaving on WebSphere 7 and 8 * support for Hibernate 4.0 beta as a JPA provider +* upgraded to JUnit 4.8.2 * prepared Spring's DataSource and RowSet adapters for forward compatibility with JDBC 4.1 * introduced ForkJoinPoolFactoryBean for Java 7 (alternative: add new jsr166.jar to Java 6) * DefaultListableBeanFactory is only deserializable through a SerializedBeanFactoryReference diff --git a/build.versions b/build.versions index 83756928d4..6429ee38f6 100644 --- a/build.versions +++ b/build.versions @@ -1,5 +1,5 @@ # common dependency versions aspectj.version=1.6.8.RELEASE slf4j.version=1.5.3 -junit.version=4.8.1 +junit.version=4.8.2 testng.version=5.12.1 diff --git a/org.springframework.aop/.classpath b/org.springframework.aop/.classpath index a662636658..e53be58285 100644 --- a/org.springframework.aop/.classpath +++ b/org.springframework.aop/.classpath @@ -15,7 +15,7 @@ - + diff --git a/org.springframework.aspects/.classpath b/org.springframework.aspects/.classpath index 7d94f9fc16..d5ab828d37 100644 --- a/org.springframework.aspects/.classpath +++ b/org.springframework.aspects/.classpath @@ -14,7 +14,7 @@ - + diff --git a/org.springframework.beans/.classpath b/org.springframework.beans/.classpath index e081492588..194b7b7a00 100644 --- a/org.springframework.beans/.classpath +++ b/org.springframework.beans/.classpath @@ -12,7 +12,7 @@ - + diff --git a/org.springframework.context.support/.classpath b/org.springframework.context.support/.classpath index ac5d24c805..70587569ff 100644 --- a/org.springframework.context.support/.classpath +++ b/org.springframework.context.support/.classpath @@ -28,6 +28,6 @@ - + diff --git a/org.springframework.context/.classpath b/org.springframework.context/.classpath index ede89d7aae..6a87a6edb4 100644 --- a/org.springframework.context/.classpath +++ b/org.springframework.context/.classpath @@ -35,7 +35,7 @@ - + diff --git a/org.springframework.core/.classpath b/org.springframework.core/.classpath index 55672a5fb5..e3361b8dae 100644 --- a/org.springframework.core/.classpath +++ b/org.springframework.core/.classpath @@ -7,7 +7,7 @@ - + diff --git a/org.springframework.expression/.classpath b/org.springframework.expression/.classpath index d07d7a879e..469e2bc61b 100644 --- a/org.springframework.expression/.classpath +++ b/org.springframework.expression/.classpath @@ -6,7 +6,7 @@ - + diff --git a/org.springframework.integration-tests/.classpath b/org.springframework.integration-tests/.classpath index f10970b6be..22b0a51956 100644 --- a/org.springframework.integration-tests/.classpath +++ b/org.springframework.integration-tests/.classpath @@ -86,7 +86,7 @@ - + diff --git a/org.springframework.jdbc/.classpath b/org.springframework.jdbc/.classpath index a8aa9a8719..1d6e759aa5 100644 --- a/org.springframework.jdbc/.classpath +++ b/org.springframework.jdbc/.classpath @@ -13,7 +13,7 @@ - + diff --git a/org.springframework.jms/.classpath b/org.springframework.jms/.classpath index 31f1d1466c..d1bb8c8f80 100644 --- a/org.springframework.jms/.classpath +++ b/org.springframework.jms/.classpath @@ -10,7 +10,7 @@ - + diff --git a/org.springframework.orm/.classpath b/org.springframework.orm/.classpath index b64298856d..b7c34616fb 100644 --- a/org.springframework.orm/.classpath +++ b/org.springframework.orm/.classpath @@ -38,7 +38,7 @@ - + diff --git a/org.springframework.oxm/.classpath b/org.springframework.oxm/.classpath index 686de87c13..7e109f51e7 100644 --- a/org.springframework.oxm/.classpath +++ b/org.springframework.oxm/.classpath @@ -18,7 +18,7 @@ - + diff --git a/org.springframework.spring-parent/pom.xml b/org.springframework.spring-parent/pom.xml index a285c198a7..3abc16cc61 100644 --- a/org.springframework.spring-parent/pom.xml +++ b/org.springframework.spring-parent/pom.xml @@ -44,7 +44,7 @@ junit junit - 4.8.1 + 4.8.2 test diff --git a/org.springframework.test/.classpath b/org.springframework.test/.classpath index bcf57c52c7..c2e5c334f9 100644 --- a/org.springframework.test/.classpath +++ b/org.springframework.test/.classpath @@ -28,7 +28,7 @@ - + diff --git a/org.springframework.test/test.iml b/org.springframework.test/test.iml index 524b9873c3..c320d621e6 100644 --- a/org.springframework.test/test.iml +++ b/org.springframework.test/test.iml @@ -84,11 +84,11 @@ - + - + diff --git a/org.springframework.transaction/.classpath b/org.springframework.transaction/.classpath index 948ca1a506..111fc235a7 100644 --- a/org.springframework.transaction/.classpath +++ b/org.springframework.transaction/.classpath @@ -15,7 +15,7 @@ - + diff --git a/org.springframework.web.portlet/.classpath b/org.springframework.web.portlet/.classpath index 5c425cef57..6d38267488 100644 --- a/org.springframework.web.portlet/.classpath +++ b/org.springframework.web.portlet/.classpath @@ -14,7 +14,7 @@ - + diff --git a/org.springframework.web.servlet/.classpath b/org.springframework.web.servlet/.classpath index a41b19349c..7e31af1130 100644 --- a/org.springframework.web.servlet/.classpath +++ b/org.springframework.web.servlet/.classpath @@ -29,7 +29,7 @@ - + diff --git a/org.springframework.web.struts/.classpath b/org.springframework.web.struts/.classpath index f042ddbe63..1915b503cf 100644 --- a/org.springframework.web.struts/.classpath +++ b/org.springframework.web.struts/.classpath @@ -23,6 +23,6 @@ - + diff --git a/org.springframework.web/.classpath b/org.springframework.web/.classpath index e74ad26157..fd474e85e5 100644 --- a/org.springframework.web/.classpath +++ b/org.springframework.web/.classpath @@ -31,7 +31,7 @@ - +