don't apply @TestFor automatically if there is already a @TestMixin present
upgrade gpars to 1.2.1, fixes GRAILS-11424
fix grails-scripts Eclipse integration
fix GGTS Groovy compiler problem
Merge branch '2.3.x' into 2.4.x
fix grails-scripts Eclipse integration
- changed after 3b52aa3b8
GRAILS-11493 add test for calling encodeAsXML on grails.converters.XML
instance
GRAILS-11428 add dependency to grails-datastore-test-support which contains HibernateTestMixin
Merge branch '2.3.x' into 2.4.x

Conflicts:
	grails-resources/src/grails/grails-app/conf/BuildConfig.groovy
Make sure any transitive Spring dependencies use the correct version of Spring and don't pull in older versions which can break Grails.

This is done by making Spring managed dependencies at the Aether level. Ideally it would be nice to allow the user to specify managed dependencies, but we don't have an API for this yet.

Note that it is still possible for the user to use an older version of Spring if they declare a dependency at the top level (depth == 0)
Merge branch '2.4.x' of github.com:grails/grails-core into 2.4.x

Conflicts:
	grails-resources/src/grails/grails-app/conf/BuildConfig.groovy
Related to previous commit, ensure the correct version of Groovy is used
add more Spring dependencies to list of managed dependencies
GRAILS-11493 should allow setting request.xml with XML instance
Merge branch '2.3.x' into 2.4.x
Merge remote-tracking branch 'origin/2.4.x' into 2.4.x
GRAILS-11421 - prettyPrint stack trace exceptions if the stack trace is empty for any reason
Cleanup spacing
Merge pull request #508 from longwa/GRAILS-11421

GRAILS-11421 - prettyPrint stack trace throws exception if stackTrace is empty
GRAILS-11494 restore unix terminal settings in shutdown hook