Merge branch '2.1.x' into 2.2.x

jeffscottbrown · jeffscottbrown · commit 11a9039745b9 · 2012-12-17T08:02:53.000-06:00
diff --git a/grails-core/build.gradle b/grails-core/build.gradle
@@ -56,8 +56,6 @@ dependencies {
         exclude group: 'xml-apis', module:'xml-apis'
     }
 
-    runtime 'org.liquibase:liquibase-core:2.0.5'
-
     compile ("com.springsource.springloaded:springloaded-core:$springLoadedVersion") {
         ext.notInPom = true
     }
diff --git a/grails-hibernate/build.gradle b/grails-hibernate/build.gradle
@@ -78,6 +78,7 @@ dependencies {
         exclude group: 'commons-logging', module:'commons-logging'
     }
     runtime 'javax.validation:validation-api:1.0.0.GA'
+    runtime 'org.liquibase:liquibase-core:2.0.5'
 }
 
 test {

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,6 @@ dependencies {`
`56`	`56`	`exclude group: 'xml-apis', module:'xml-apis'`
`57`	`57`	`}`
`58`	`58`
`59`		`- runtime 'org.liquibase:liquibase-core:2.0.5'`
`60`		`-`
`61`	`59`	`compile ("com.springsource.springloaded:springloaded-core:$springLoadedVersion") {`
`62`	`60`	`ext.notInPom = true`
`63`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ dependencies {`
`78`	`78`	`exclude group: 'commons-logging', module:'commons-logging'`
`79`	`79`	`}`
`80`	`80`	`runtime 'javax.validation:validation-api:1.0.0.GA'`
	`81`	`+ runtime 'org.liquibase:liquibase-core:2.0.5'`
`81`	`82`	`}`
`82`	`83`
`83`	`84`	`test {`