diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy index 8353a18..70e67c4 100644 --- a/grails-app/conf/BuildConfig.groovy +++ b/grails-app/conf/BuildConfig.groovy @@ -10,37 +10,14 @@ grails.project.dependency.resolution = { grailsCentral() mavenLocal() mavenCentral() - mavenRepo "http://m2repo.spockframework.org/releases/" - mavenRepo "http://m2repo.spockframework.org/snapshots/" } dependencies { - test("org.seleniumhq.selenium:selenium-firefox-driver:latest.integration") { - export = false - } - test("org.spockframework:spock-grails-support:0.6-groovy-1.7-SNAPSHOT") { - excludes "spock-core", "slf4j-log4j12", "slf4j-api", "log4j" - export = false - } - test("org.spockframework:spock-core:0.6-groovy-1.8-SNAPSHOT") { - exclude "groovy-all" - export = false - } } plugins { - runtime ":resources:1.0" + runtime ":resources:1.2.14" - build( ":release:1.0.0.RC1") { + build( ":release:2.2.1") { export = false } - build( ":tomcat:$grailsVersion" ) { - export = false - } - test( ":geb:0.5.1" ) { - export = false - } - test(":spock:0.6-SNAPSHOT") { - exclude "spock-grails-support" - export = false - } } } diff --git a/src/groovy/grails/plugin/prototype/PrototypeProvider.groovy b/src/groovy/grails/plugin/prototype/PrototypeProvider.groovy index 9bebc95..80486af 100644 --- a/src/groovy/grails/plugin/prototype/PrototypeProvider.groovy +++ b/src/groovy/grails/plugin/prototype/PrototypeProvider.groovy @@ -62,7 +62,7 @@ class PrototypeProvider implements JavascriptProvider { } else if (attrs.params instanceof Map) { def params = createQueryString(attrs.params) - attrs.params = "'${params}${params ? '&' : ''}${url[i+1..-1].encodeAsJavaScript()}'" + attrs.params = "'${params ? '&' : ''}${url[i+1..-1].encodeAsJavaScript()}'" } else { attrs.params = "'${url[i+1..-1].encodeAsJavaScript()}'"