diff --git a/build-spring-framework/resources/changelog.txt b/build-spring-framework/resources/changelog.txt index 59c8f4b5631..4bf993674e7 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 83756928d4d..6429ee38f66 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 a6626366583..e53be582854 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 7d94f9fc164..d5ab828d375 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 e0814925883..194b7b7a005 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 ac5d24c805b..70587569ff9 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 ede89d7aae5..6a87a6edb49 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 55672a5fb5f..e3361b8dae4 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 d07d7a879e8..469e2bc61b2 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 f10970b6be9..22b0a519567 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 a8aa9a87195..1d6e759aa5f 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 31f1d1466c8..d1bb8c8f804 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 b64298856dc..b7c34616fb1 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 686de87c13e..7e109f51e7d 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 a285c198a74..3abc16cc611 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 bcf57c52c77..c2e5c334f91 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 524b9873c3d..c320d621e60 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 948ca1a5063..111fc235a7d 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 5c425cef57b..6d382674888 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 a41b19349c3..7e31af1130c 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 f042ddbe632..1915b503cf5 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 e74ad26157b..fd474e85e53 100644 --- a/org.springframework.web/.classpath +++ b/org.springframework.web/.classpath @@ -31,7 +31,7 @@ - +