diff --git a/build-spring-framework/resources/changelog.txt b/build-spring-framework/resources/changelog.txt
index 5359ed6d26a..de74aa6b62e 100644
--- a/build-spring-framework/resources/changelog.txt
+++ b/build-spring-framework/resources/changelog.txt
@@ -3,6 +3,12 @@ SPRING FRAMEWORK CHANGELOG
http://www.springsource.org
+Changes in version 3.0.0.RC1 (2009 Q3)
+--------------------------------------
+
+* upgraded to JUnit 4.7 and TestNG 5.10
+
+
Changes in version 3.0.0.M4 (2009-08-10)
-----------------------------------------
diff --git a/build.versions b/build.versions
index 759fddcb75b..3ecf22342c9 100644
--- a/build.versions
+++ b/build.versions
@@ -1,2 +1,2 @@
-org.testng.version=5.9.0
+org.testng.version=5.10.0
org.junit.version=4.7.0
\ No newline at end of file
diff --git a/org.springframework.test/.classpath b/org.springframework.test/.classpath
index 84715c8bae0..1c7f22ca975 100644
--- a/org.springframework.test/.classpath
+++ b/org.springframework.test/.classpath
@@ -21,7 +21,7 @@
-
+
diff --git a/org.springframework.test/pom.xml b/org.springframework.test/pom.xml
index c6cdb41426c..370e59518c9 100644
--- a/org.springframework.test/pom.xml
+++ b/org.springframework.test/pom.xml
@@ -81,7 +81,7 @@
org.testng
testng
- 5.9
+ 5.10
jdk15
true
diff --git a/org.springframework.test/template.mf b/org.springframework.test/template.mf
index 88c239ef5ba..ecaa2989c05 100644
--- a/org.springframework.test/template.mf
+++ b/org.springframework.test/template.mf
@@ -19,7 +19,7 @@ Import-Template:
org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional,
org.junit.*;version="[4.7.0, 5.0.0)";resolution:=optional,
org.springframework.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.testng.*;version="[5.9.0, 6.0.0)";resolution:=optional,
+ org.testng.*;version="[5.10.0, 6.0.0)";resolution:=optional,
org.w3c.dom.*;version="0";resolution:=optional
Ignored-Existing-Headers:
Bnd-LastModified,
diff --git a/org.springframework.test/test.iml b/org.springframework.test/test.iml
index a0339bbe58b..0e479b08d10 100644
--- a/org.springframework.test/test.iml
+++ b/org.springframework.test/test.iml
@@ -89,11 +89,11 @@
-
+
-
+
diff --git a/spring-framework-reference/src/testing.xml b/spring-framework-reference/src/testing.xml
index 362beac9d73..3c677cb6ffd 100644
--- a/spring-framework-reference/src/testing.xml
+++ b/spring-framework-reference/src/testing.xml
@@ -813,14 +813,14 @@ public void testProcessRepeatedly() {
org.springframework.test.context package) provides
generic, annotation-driven unit and integration testing support that
is agnostic of the testing framework in use, for example JUnit 3.8,
- JUnit 4.7, TestNG 5.9, etc. The TestContext framework also places a
+ JUnit 4.7, TestNG 5.10, etc. The TestContext framework also places a
great deal of importance on convention over
configuration with reasonable defaults that can be
overridden via annotation-based configuration.
In addition to generic testing infrastructure, the TestContext
framework provides explicit support for JUnit 3.8, JUnit 4.7, and
- TestNG 5.9 in the form of abstract support
+ TestNG 5.10 in the form of abstract support
classes. For JUnit 4.7, the framework also provides a custom
Runner which allows one to write test
classes that are not required to extend a particular class