From 780378e45d8f1c495c186e6ed145923b3a6a7ebd Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Tue, 11 Aug 2009 10:31:06 +0000
Subject: [PATCH] [SPR-5964] Upgraded to TestNG 5.10

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1732 50f2f4bb-b051-0410-bef5-90022cba6387
---
 build-spring-framework/resources/changelog.txt | 6 ++++++
 build.versions                                 | 2 +-
 org.springframework.test/.classpath            | 2 +-
 org.springframework.test/pom.xml               | 2 +-
 org.springframework.test/template.mf           | 2 +-
 org.springframework.test/test.iml              | 4 ++--
 spring-framework-reference/src/testing.xml     | 4 ++--
 7 files changed, 14 insertions(+), 8 deletions(-)

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 @@
 	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp/2.1.0/com.springsource.javax.servlet.jsp-2.1.0.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp/2.1.0/com.springsource.javax.servlet.jsp-sources-2.1.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-sources-3.8.2.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.testng/com.springsource.org.testng/5.9.0/com.springsource.org.testng-5.9.0.jar" sourcepath="/IVY_CACHE/org.testng/com.springsource.org.testng/5.9.0/com.springsource.org.testng-sources-5.9.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.testng/com.springsource.org.testng/5.10.0/com.springsource.org.testng-5.10.0.jar" sourcepath="/IVY_CACHE/org.testng/com.springsource.org.testng/5.10.0/com.springsource.org.testng-sources-5.10.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-1.1.2.jar" sourcepath="/IVY_CACHE/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-sources-1.1.2.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.3.RELEASE/com.springsource.org.aspectj.weaver-1.6.3.RELEASE.jar"/>
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 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>5.9</version>
+      <version>5.10</version>
       <classifier>jdk15</classifier>
       <optional>true</optional>
     </dependency>
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 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$IVY_CACHE$/org.testng/com.springsource.org.testng/5.9.0/com.springsource.org.testng-5.9.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.testng/com.springsource.org.testng/5.10.0/com.springsource.org.testng-5.10.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$IVY_CACHE$/org.testng/com.springsource.org.testng/5.9.0/com.springsource.org.testng-sources-5.9.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.testng/com.springsource.org.testng/5.10.0/com.springsource.org.testng-sources-5.10.0.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
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() {
       <literal>org.springframework.test.context</literal> 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 <emphasis>convention over
       configuration</emphasis> with reasonable defaults that can be
       overridden via annotation-based configuration.</para>
 
       <para>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 <literal>abstract</literal> support
+      TestNG 5.10 in the form of <literal>abstract</literal> support
       classes. For JUnit 4.7, the framework also provides a custom
       <interfacename>Runner</interfacename> which allows one to write test
       classes that are not required to extend a particular class