Revision: 16694
http://sourceforge.net/p/gate/code/16694
Author: valyt
Date: 2013-05-24 13:02:30 +0000 (Fri, 24 May 2013)
Log Message:
-----------
Spock seems to resolve its dependencies via ESP(*). Adding explicit config may
help with repeatable builds.
Maybe. If you're lucky. Probably not, really...
(*) ESP = External Settings from some arbitrary Project that you happened to
have compiled before on the same machine (TM).
Modified Paths:
--------------
mimir/trunk/mimir-cloud/grails-app/conf/BuildConfig.groovy.template
mimir/trunk/mimir-cloud/grails-app/conf/Config.groovy
mimir/trunk/mimir-web/grails-app/conf/BuildConfig.groovy.template
Modified: mimir/trunk/mimir-cloud/grails-app/conf/BuildConfig.groovy.template
===================================================================
--- mimir/trunk/mimir-cloud/grails-app/conf/BuildConfig.groovy.template
2013-05-24 01:18:51 UTC (rev 16693)
+++ mimir/trunk/mimir-cloud/grails-app/conf/BuildConfig.groovy.template
2013-05-24 13:02:30 UTC (rev 16694)
@@ -35,7 +35,9 @@
// specify dependencies here under either 'build', 'compile',
'runtime', 'test' or 'provided' scopes eg.
// runtime 'mysql:mysql-connector-java:5.1.20'
compile 'org.apache.commons:commons-compress:1.1'
- runtime 'org.hsqldb:hsqldb:2.2.9'
+ runtime 'org.hsqldb:hsqldb:2.2.9'
+ // bring the correct library version for groovy 2
+ test "org.spockframework:spock-grails-support:0.7-groovy-2.0"
}
plugins {
@@ -45,6 +47,10 @@
build ":tomcat:$grailsVersion"
compile ":background-thread:1.6"
compile ":spring-security-core:1.2.7.3"
+ test(":spock:0.7") {
+ // exclude default dependency, as that's unsuitable for groovy 2
+ exclude "spock-grails-support"
+ }
}
}
Modified: mimir/trunk/mimir-cloud/grails-app/conf/Config.groovy
===================================================================
--- mimir/trunk/mimir-cloud/grails-app/conf/Config.groovy 2013-05-24
01:18:51 UTC (rev 16693)
+++ mimir/trunk/mimir-cloud/grails-app/conf/Config.groovy 2013-05-24
13:02:30 UTC (rev 16694)
@@ -167,7 +167,8 @@
debug 'grails.app.services.gate.mimir',
'grails.app.controllers.gate.mimir',
'grails.app.domain.gate.mimir',
- 'grails.app.taglib.gate.mimir'
+ 'grails.app.taglib.gate.mimir',
+ 'gate.mimir.db'
// 'grails.app.service.grails.plugins.springsecurity',
// 'grails.app.controller.grails.plugins.springsecurity',
Modified: mimir/trunk/mimir-web/grails-app/conf/BuildConfig.groovy.template
===================================================================
--- mimir/trunk/mimir-web/grails-app/conf/BuildConfig.groovy.template
2013-05-24 01:18:51 UTC (rev 16693)
+++ mimir/trunk/mimir-web/grails-app/conf/BuildConfig.groovy.template
2013-05-24 13:02:30 UTC (rev 16694)
@@ -49,7 +49,10 @@
// We must use the same version of Ant as the one provided by Grails
// For Grails 2.1.1, this is Ant 1.8.2
- runtime 'org.apache.ant:ant:1.8.2'
+ runtime 'org.apache.ant:ant:1.8.2'
+
+ // bring the correct library version for groovy 2
+ test "org.spockframework:spock-grails-support:0.7-groovy-2.0"
}
plugins {
@@ -66,6 +69,10 @@
compile(':gwt:0.8') {
excludes 'resources'
}
+ test(":spock:0.7") {
+ // exclude default dependency, as that's unsuitable for groovy 2
+ exclude "spock-grails-support"
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
