From fa48a7b3a38c6d1cdd8046dbcfeeb1a70dfb859f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 28 Mar 2011 19:59:09 +0000
Subject: [PATCH] Updating JUnit and TestNG versions for IDEs and Maven.

---
 org.springframework.spring-parent/pom.xml | 2 +-
 org.springframework.test/.classpath       | 1 -
 org.springframework.test/ivy.xml          | 1 -
 org.springframework.test/test.iml         | 9 ++++-----
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/org.springframework.spring-parent/pom.xml b/org.springframework.spring-parent/pom.xml
index ee4be80e53b..a285c198a74 100644
--- a/org.springframework.spring-parent/pom.xml
+++ b/org.springframework.spring-parent/pom.xml
@@ -44,7 +44,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.7</version>
+        <version>4.8.1</version>
         <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/org.springframework.test/.classpath b/org.springframework.test/.classpath
index ec7570f766c..221a30f9154 100644
--- a/org.springframework.test/.classpath
+++ b/org.springframework.test/.classpath
@@ -20,7 +20,6 @@
 	<classpathentry kind="var" path="IVY_CACHE/javax.portlet/com.springsource.javax.portlet/2.0.0/com.springsource.javax.portlet-2.0.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
 	<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.8.1/com.springsource.org.junit-4.8.1.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.8.1/com.springsource.org.junit-sources-4.8.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.testng/com.springsource.org.testng/5.12.1/com.springsource.org.testng-5.12.1.jar" sourcepath="/IVY_CACHE/org.testng/com.springsource.org.testng/5.12.1/com.springsource.org.testng-sources-5.12.1.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"/>
diff --git a/org.springframework.test/ivy.xml b/org.springframework.test/ivy.xml
index c0a1c5eb025..01284eeadd0 100644
--- a/org.springframework.test/ivy.xml
+++ b/org.springframework.test/ivy.xml
@@ -35,7 +35,6 @@
 		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional->compile"/>
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.3.1.GA" conf="test->compile"/>
 		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->compile"/>
-		<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="optional->compile"/>
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="optional->compile"/>
 		<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->compile"/>
 		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="optional->compile"/>
diff --git a/org.springframework.test/test.iml b/org.springframework.test/test.iml
index 924d7b776d9..efbc674c3e8 100644
--- a/org.springframework.test/test.iml
+++ b/org.springframework.test/test.iml
@@ -84,11 +84,11 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$IVY_CACHE$/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-3.8.2.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.junit/com.springsource.org.junit/4.8.1/com.springsource.org.junit-4.8.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$IVY_CACHE$/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-sources-3.8.2.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.junit/com.springsource.org.junit/4.8.1/com.springsource.org.junit-sources-4.8.1.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -117,11 +117,11 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$IVY_CACHE$/org.testng/com.springsource.org.testng/5.10.0/com.springsource.org.testng-5.10.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.testng/com.springsource.org.testng/5.12.1/com.springsource.org.testng-5.12.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$IVY_CACHE$/org.testng/com.springsource.org.testng/5.10.0/com.springsource.org.testng-sources-5.10.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.testng/com.springsource.org.testng/5.12.1/com.springsource.org.testng-sources-5.12.1.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -132,4 +132,3 @@
     </Base>
   </component>
 </module>
-