From 32092bf98467729f4f9cd916d4a7835a1049181d Mon Sep 17 00:00:00 2001 From: Markus List Date: Wed, 8 May 2013 12:47:52 +0200 Subject: [PATCH 1/3] Fixing parameter issues found in GPPROTO-4 and GPPROTO-5 --- src/groovy/grails/plugin/prototype/PrototypeProvider.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()}'" From e6fcb2c79b6ea0a1c233e1b8c306203e691cfc47 Mon Sep 17 00:00:00 2001 From: Markus List Date: Fri, 30 May 2014 10:41:19 +0200 Subject: [PATCH 2/3] include backend as dependency again --- grails-app/conf/BuildConfig.groovy | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy index 8353a18..45623a9 100644 --- a/grails-app/conf/BuildConfig.groovy +++ b/grails-app/conf/BuildConfig.groovy @@ -17,19 +17,12 @@ grails.project.dependency.resolution = { 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 - } + test "org.spockframework:spock-grails-support:0.7-groovy-2.0" } plugins { runtime ":resources:1.0" - build( ":release:1.0.0.RC1") { + build( ":release:2.2.1") { export = false } build( ":tomcat:$grailsVersion" ) { @@ -38,9 +31,8 @@ grails.project.dependency.resolution = { test( ":geb:0.5.1" ) { export = false } - test(":spock:0.6-SNAPSHOT") { - exclude "spock-grails-support" - export = false - } + test(":spock:0.7") { + exclude "spock-grails-support" + } } } From 03b809f57824e7fcbce82ce5376fb0082478e5ed Mon Sep 17 00:00:00 2001 From: Markus List Date: Mon, 17 Aug 2015 19:35:24 +0200 Subject: [PATCH 3/3] upgrade to grails 2.5 --- grails-app/conf/BuildConfig.groovy | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy index 45623a9..70e67c4 100644 --- a/grails-app/conf/BuildConfig.groovy +++ b/grails-app/conf/BuildConfig.groovy @@ -10,29 +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.7-groovy-2.0" } plugins { - runtime ":resources:1.0" + runtime ":resources:1.2.14" build( ":release:2.2.1") { export = false } - build( ":tomcat:$grailsVersion" ) { - export = false - } - test( ":geb:0.5.1" ) { - export = false - } - test(":spock:0.7") { - exclude "spock-grails-support" - } } }