Suppress serialization warning
MBeanInfoAssembler impls expose actual method parameter names if possible

Issue: SPR-9985
ThreadPoolExecutorFactoryBean exposes "createExecutor" method for custom ThreadPoolExecutor subclasses

Issue: SPR-9435
Added further MySQL error code for DataIntegrityViolationException

Issue: SPR-9237
DisposableBeanAdapter detects "shutdown" as a destroy method as well (for EHCache CacheManager setup)

 Issue: SPR-9713
Updated resolvePath javadoc to reflect Environment-based placeholder resolution

Issue: SPR-9455
ResourcePropertyResource accepts EncodedResource for properties files with a specific encoding

Also added constructor with Charset argument to EncodedResource.

Issue: SPR-10096
Removed pre-JDK-1.5 checks
Polishing
Final preparations for 3.2.1
Change merge.into project dependencies to provided

Change 'compile' dependencies to 'provided' for projects that are
merged into other projects. This seems to prevent '-sources' and
'-javadoc' jars from appearing on the classpath which can break
javadoc generation.
Provide support for context hierarchies in the TCF

Prior to this commit the Spring TestContext Framework supported creating
only flat, non-hierarchical contexts. There was no easy way to create
contexts with parent-child relationships.

- Introduced a new @ContextHierarchy annotation.
- Introduced 'name' attribute in @ContextConfiguration.
- Introduced 'name' property in ContextConfigurationAttributes.
- TestContext is now aware of @ContextHierarchy in addition to
  @ContextConfiguration.
- Introduced findAnnotationDeclaringClassForTypes() in AnnotationUtils.
- Introduced resolveContextHierarchyAttributes() in ContextLoaderUtils.
- Introduced buildContextHierarchyMap() in ContextLoaderUtils.
- @ContextConfiguration and @ContextHierarchy may not be used as
  top-level, class-level annotations simultaneously.
- Introduced reference to the parent configuration in
  MergedContextConfiguration and WebMergedContextConfiguration.
- Introduced overloaded buildMergedContextConfiguration() methods in
  ContextLoaderUtils in order to handle context hierarchies separately
  from conventional, non-hierarchical contexts.
- Introduced CacheAwareContextLoaderDelegate that can be used for
  loading contexts with transparent support for interacting with the
  context cache -- for example, for retrieving the parent application
  context in a context hierarchy.
- TestContext now delegates to CacheAwareContextLoaderDelegate for
  loading contexts.
- Introduced getParentApplicationContext() in MergedContextConfiguration
- The loadContext(MergedContextConfiguration) methods in
  AbstractGenericContextLoader and AbstractGenericWebContextLoader now
  set the parent context as appropriate.
- ContextCache now internally tracks the relationships between contexts
  that make up a context hierarchy. Furthermore, when a context is
  removed, if it is a parent context all of contexts below that context
  in the context hierarchy will also be removed.
- Updated Javadoc to avoid and/or suppress warnings in spring-test
- Suppressed remaining warnings in code in spring-test

Issue: SPR-5613, SPR-9863