Merge branch '2.1.x' into 2.2.x

jeffscottbrown · jeffscottbrown · commit 7fa608d72478 · 2012-12-17T06:49:01.000-06:00
Conflicts:
	grails-core/build.gradle
diff --git a/grails-core/build.gradle b/grails-core/build.gradle
@@ -56,7 +56,9 @@ dependencies {
         exclude group: 'xml-apis', module:'xml-apis'
     }
 
-    compile ("org.springsource.springloaded:springloaded-core:$springLoadedVersion") {
+    runtime 'org.liquibase:liquibase-core:2.0.5'
+
+    compile ("com.springsource.springloaded:springloaded-core:$springLoadedVersion") {
         ext.notInPom = true
     }
 
@@ -72,4 +74,4 @@ compileGroovy.doFirst {
     }
 }
 
-jar.appendix = 'core'
+jar.appendix = 'core'

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,9 @@ dependencies {`
`56`	`56`	`exclude group: 'xml-apis', module:'xml-apis'`
`57`	`57`	`}`
`58`	`58`
`59`		`- compile ("org.springsource.springloaded:springloaded-core:$springLoadedVersion") {`
	`59`	`+ runtime 'org.liquibase:liquibase-core:2.0.5'`
	`60`	`+`
	`61`	`+ compile ("com.springsource.springloaded:springloaded-core:$springLoadedVersion") {`
`60`	`62`	`ext.notInPom = true`
`61`	`63`	`}`
`62`	`64`
`@@ -72,4 +74,4 @@ compileGroovy.doFirst {`
`72`	`74`	`}`
`73`	`75`	`}`
`74`	`76`
`75`		`-jar.appendix = 'core'`
	`77`	`+jar.appendix = 'core'`