Aether: unsuccessful attempt and fixing resolving transitive javadoc/sources. Still investigating
Fix for GRAILS-9610 "DevelopmentResourceLoader does not correctly handle resource locations with schemes"
Merge pull request #315 from candrews/patch-2

Fix for GRAILS-9610 "DevelopmentResourceLoader does not correctly handle resource locations with schemes"
fix Groovy cast error
Merge branch 'master' of github.com:grails/grails-core
testing with Spring 3.1.4.BUILD-SNAPSHOT
Merge branch '2.1.x' into 2.2.x

Conflicts:
	dependencies.txt
	grails-core/src/main/groovy/org/codehaus/groovy/grails/support/DevelopmentResourceLoader.java
testing with Spring 3.1.4.BUILD-SNAPSHOT
Aether: fix resolution of sources / javadoc
upgrade to Groovy 2.1 rc3
Aether: fix POM generation
GRAILS-9674 Reapply Jeff fixes to upgrade Spring to 3.2.0.RELEASE
upgrade to tomcat 7.0.35
Initial cut of forked compilation, currently only for sources not test sources. Deactivated by default
Upgrade to Spring 3.1.4
Merge branch '2.0.x' into 2.1.x

Conflicts:
	build.gradle
	build.properties
	dependencies.txt
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
	grails-core/src/main/groovy/org/codehaus/groovy/grails/commons/spring/GrailsWebApplicationContext.java
Merge branch '2.1.x' into 2.2.x

Conflicts:
	dependencies.txt
Merge branch '2.2.x'

Conflicts:
	build.gradle
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
initial cut at forking a reserve JVM that can later be resumed to avoid startup cost. Currently implemented for forked compilation
Merge branch 'master' of github.com:grails/grails-core