diff --git a/build-spring-framework/resources/changelog.txt b/build-spring-framework/resources/changelog.txt index 22f0fd8501b..b63f6d93f24 100644 --- a/build-spring-framework/resources/changelog.txt +++ b/build-spring-framework/resources/changelog.txt @@ -10,7 +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 +* upgraded to JUnit 4.9 * 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 6429ee38f66..53ef1c04a86 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.2 +junit.version=4.9.0 testng.version=5.12.1 diff --git a/org.springframework.aop/.classpath b/org.springframework.aop/.classpath index e53be582854..5784a2cf3aa 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 d5ab828d375..35de98089f7 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 194b7b7a005..0df47b6a24f 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 70587569ff9..c72b7b361aa 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 6a87a6edb49..34719b6a128 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 e3361b8dae4..24218aeeeb3 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 469e2bc61b2..91afb00f22e 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 22b0a519567..fea2e6c8ffa 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 1d6e759aa5f..84acd930fdb 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 d1bb8c8f804..db3ba76f692 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 b7c34616fb1..f942f712741 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 7e109f51e7d..06b797a996a 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 3abc16cc611..a429f389084 100644 --- a/org.springframework.spring-parent/pom.xml +++ b/org.springframework.spring-parent/pom.xml @@ -44,7 +44,7 @@ junit junit - 4.8.2 + 4.9.0 test diff --git a/org.springframework.test/.classpath b/org.springframework.test/.classpath index c2e5c334f91..bb583c41fd3 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 c320d621e60..65ec48e4ae8 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 111fc235a7d..9d8595979ac 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 6d382674888..55dd4eea903 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 7e31af1130c..ebeb77d8ec5 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 1915b503cf5..7b55e517207 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 fd474e85e53..32843f72bdb 100644 --- a/org.springframework.web/.classpath +++ b/org.springframework.web/.classpath @@ -31,7 +31,7 @@ - + diff --git a/spring-framework-reference/src/testing.xml b/spring-framework-reference/src/testing.xml index 69e7d523ef9..f1d0e4111e4 100644 --- a/spring-framework-reference/src/testing.xml +++ b/spring-framework-reference/src/testing.xml @@ -1497,7 +1497,7 @@ public void updateWithSessionFlush() { The Spring TestContext Framework offers full integration with JUnit 4.5+ through a custom runner (tested on - JUnit 4.5 – 4.8.2). By annotating test classes with + JUnit 4.5 – 4.9). By annotating test classes with @RunWith(SpringJUnit4ClassRunner.class), developers can implement standard JUnit-based unit and integration tests and simultaneously reap the benefits of the TestContext