Project: springxd
Issue XD-2038: Restore JDK6 compatibility
Story points: 2