fix GEOS-5995-deadlock setting spring to 3.1.4
Merge pull request #336 from ccancellieri/2.4.x-GEOS-5995-deadlock

fix GEOS-5995-deadlock setting spring to 3.1.4
Make newlines in test platform independent