Phillip Webb 761bd9fd56 Merge branch '3.2.x' ... * 3.2.x: Update javadoc external links JdbcTemplate etc Removed unnecessary default value of LifecycleGroup.lifecycleBeans Introduced public ArgumentPreparedStatementSetter and ArgumentTypePreparedStatementSetter classes Defensively uses JDBC 3.0 getParameterType call for Oracle driver compatibility Preparations for 3.2.3 Fixed ReflectiveMethodResolver to avoid potential UnsupportedOperationException on sort Fixed Jaxb2Marshaller's partial unmarshalling feature to consistently apply to all sources Update copyright year in reference documentation Conflicts: build.gradle gradle.properties spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentPreparedStatementSetter.java spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentTypePreparedStatementSetter.java		2013-04-13 09:39:09 -07:00
..
src	Merge branch '3.2.x'	2013-04-13 09:39:09 -07:00
.springBeans	Rename modules {org.springframework.*=>spring-*}	2012-01-31 14:37:10 +01:00