Upgraded JUnit Version
Update grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy

Fix for GRAILS-9565
fix for GRAILS-9144 "Interactive mode on Windows is broken"
update to datastore 1.1.1
fix datastore version
Merge branch '2.1.x' into 2.2.x
update version to 2.1.2
update version to 2.2.0 RC3
fix GRAILS-9596: 'upgrade' command was not invoking _Upgrade.groovy for plugins (whether local, global, or inline).
Merge branch '2.1.x'
2.1.3.BUILD-SNAPSHOT
GRAILS-9646 - fix wrapper

The previous code was matching any groovy jar file which began with groovy-all-.  Since we include source and javadoc jars now, those broke that logic.  Now we look for a jar name that matches a more specific regex.
GRAILS-9646 - fix wrapper

The previous code was matching any groovy jar file which began with groovy-all-.  Since we include source and javadoc jars now, those broke that logic.  Now we look for a jar name that matches a more specific regex.
Merge branch '2.2.x'

Conflicts:
	build.gradle
	build.properties
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
Revert "introduce new configuration option that disables parsing of dependencies.groovy completely so that only POM data is used. Parsing dependencies.groovy is disabled by default for new applications."

This reverts commit 56ff6d223737c4f1ed75a487c609a6de98d79192.

This revert is temporary as we troubleshoot issues with the build server.
Revert "Revert "introduce new configuration option that disables parsing of dependencies.groovy completely so that only POM data is used. Parsing dependencies.groovy is disabled by default for new applications.""

This reverts commit 2758a05c4541515d5208408f432f701233734d7f.
include poms in the plugins dir

This is copying the poms for plugins that we ship in the release into the plugins dir.  We still need to rig up core to look for these poms.
GRAILS-9535 - update interactive mode prompt
resolve poms from <grails home>/plugins/ dir
Merge branch '2.2.x'