From 2775862c5083da345ea06ecaeed2875abc8e4c97 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Thu, 13 Dec 2012 01:05:15 +0100
Subject: [PATCH] Update migration guide regarding spring-test

This commit adds information to the 3.2 migration guide regarding
deprecations and Maven dependencies in the spring-test module.
---
 src/reference/docbook/migration-3.2.xml | 36 ++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/reference/docbook/migration-3.2.xml b/src/reference/docbook/migration-3.2.xml
index 52aa0fab2d..713699d1b8 100644
--- a/src/reference/docbook/migration-3.2.xml
+++ b/src/reference/docbook/migration-3.2.xml
@@ -9,7 +9,7 @@
         http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
   <title>Migrating to Spring Framework 3.2</title>
 
-  <para>In this appendix we discuss discuss what users will want to know when upgrading to
+  <para>In this appendix we discuss what users will want to know when upgrading to
   Spring Framework 3.2. For a general overview of features, please see
   <xref linkend="new-in-3.2"/></para>
 
@@ -124,6 +124,25 @@
     <xref linkend="spring-mvc-test-framework" /> for details.</para>
   </section>
 
+  <section xml:id="migration-3.2-compatibility-spring-test">
+    <title>Spring Test Dependencies</title>
+
+    <para>The <literal>spring-test</literal> module has been upgraded to
+    depend on JUnit 4.11 (<literal>junit:junit</literal>), TestNG 6.5.2
+    (<literal>org.testng:testng</literal>), and Hamcrest Core 1.3
+    (<literal>org.hamcrest:hamcrest-core</literal>). Each of these
+    dependencies is declared as an <emphasis>optional</emphasis> dependency
+    in the Maven POM. Furthermore, it is important to note that the JUnit
+    team has stopped inlining Hamcrest Core within the
+    <literal>junit:junit</literal> Maven artifact as of JUnit 4.11. Thus, if
+    your existing JUnit-based tests make use of Hamcrest matchers that were
+    previously available directly within the <literal>junit:junit</literal>
+    JAR, you will now need to explicitly declare a dependency on
+    <literal>org.hamcrest:hamcrest-core</literal>,
+    <literal>org.hamcrest:hamcrest-library</literal>, or
+    <literal>org.hamcrest:hamcrest-all</literal>.</para>
+  </section>
+
   <section xml:id="migration-3.2-changes">
     <title>Public API changes</title>
 
@@ -265,20 +284,23 @@
         <listitem>
           <para>
           <link xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.html">
-          org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests</link>
-          </para>
+          org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests</link>:
+          use of the <varname>simpleJdbcTemplate</varname> instance variable has been deprecated
+          in favor of the new <varname>jdbcTemplate</varname> instance variable.</para>
         </listitem>
         <listitem>
           <para>
           <link xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.html">
-          org.springframework.test.context.testng.AbstractTransactionalTestNGSpringContextTests</link>
-          </para>
+          org.springframework.test.context.testng.AbstractTransactionalTestNGSpringContextTests</link>:
+	      use of the <varname>simpleJdbcTemplate</varname> instance variable has been deprecated
+	      in favor of the new <varname>jdbcTemplate</varname> instance variable.</para>
         </listitem>
         <listitem>
           <para>
           <link xl:href="http://static.springsource.org/spring-framework/docs/current/javadoc-api/org/springframework/test/jdbc/SimpleJdbcTestUtils.html">
-          org.springframework.test.jdbc.SimpleJdbcTestUtils</link>
-          </para>
+          org.springframework.test.jdbc.SimpleJdbcTestUtils</link> has been deprecated in
+          favor of <classname>JdbcTestUtils</classname> which now contains all of the
+          functionality previously available in <classname>SimpleJdbcTestUtils</classname>.</para>
         </listitem>
         <listitem>
           <para>