From 26d67bdccb61aebb9d05c262f4219358aca1ec38 Mon Sep 17 00:00:00 2001 From: July Antonicheva Date: Sun, 24 Nov 2013 14:31:32 +0300 Subject: [PATCH] (WCM-876) Updated to Grails-2.3.3 --- application.properties | 2 +- grails-app/conf/BuildConfig.groovy | 6 ++++-- grails-app/conf/DataSource.groovy | 2 +- test/integration/ImportExportTests.groovy | 2 -- .../org/weceem/domain/ContentConstraintTests.groovy | 4 ++++ 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/application.properties b/application.properties index bc036fda..e88722fc 100644 --- a/application.properties +++ b/application.properties @@ -1,5 +1,5 @@ #Grails Metadata file #Tue May 14 13:45:47 CEST 2013 -app.grails.version=2.3.2 +app.grails.version=2.3.3 app.name=weceem app.version=0.1 diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy index ee0318bd..fa0c5fb7 100644 --- a/grails-app/conf/BuildConfig.groovy +++ b/grails-app/conf/BuildConfig.groovy @@ -1,5 +1,6 @@ grails.servlet.version = "3.0" grails.tomcat.jvmArgs = ["-Xmx1024m", "-XX:MaxPermSize=100m", '-verbose:class'] + grails.project.work.dir="target/work" grails.project.dependency.resolver = "maven" // or ivy @@ -37,11 +38,12 @@ grails.project.dependency.resolution = { // test "org.seleniumhq.selenium:selenium-support:$seleniumVersion" // test "org.gebish:geb-spock:$gebVersion" // test "org.gebish:geb-junit4:$gebVersion" + } plugins { // plugins for the build system only - build ":tomcat:7.0.42" + build ":tomcat:7.0.47" build (":release:3.0.1") { export = false } @@ -50,7 +52,7 @@ grails.project.dependency.resolution = { compile ':cache:1.1.1' // plugins needed at runtime but not for compilation - runtime ":hibernate:3.6.10.3" // or ":hibernate4:4.1.11.2" + runtime ":hibernate:3.6.10.4" // or ":hibernate4:4.1.11.2" runtime ":database-migration:1.3.8" compile ":bean-fields:1.0" // consider replacing with the fields plugin or even with the new Platform UI diff --git a/grails-app/conf/DataSource.groovy b/grails-app/conf/DataSource.groovy index eb67ce48..c0484d77 100644 --- a/grails-app/conf/DataSource.groovy +++ b/grails-app/conf/DataSource.groovy @@ -7,7 +7,7 @@ dataSource { hibernate { cache.use_second_level_cache=true cache.use_query_cache=true // Warning, turning this on causes lock contention - cache.provider_class='org.hibernate.cache.EhCacheProvider' + cache.region.factory_class = 'net.sf.ehcache.hibernate.EhCacheRegionFactory' // Hibernate 3 } // environment specific settings environments { diff --git a/test/integration/ImportExportTests.groovy b/test/integration/ImportExportTests.groovy index 51e9113c..cbfe4e5a 100644 --- a/test/integration/ImportExportTests.groovy +++ b/test/integration/ImportExportTests.groovy @@ -17,10 +17,8 @@ import grails.util.Holders import org.weceem.services.WcmImportExportService import grails.test.mixin.TestMixin import grails.test.mixin.integration.IntegrationTestMixin -import grails.test.mixin.TestFor import org.junit.Test import org.junit.Before -import grails.test.mixin.support.GrailsUnitTestMixin /** * ImportExportTests. diff --git a/test/integration/org/weceem/domain/ContentConstraintTests.groovy b/test/integration/org/weceem/domain/ContentConstraintTests.groovy index f66433f5..d9c87b7f 100644 --- a/test/integration/org/weceem/domain/ContentConstraintTests.groovy +++ b/test/integration/org/weceem/domain/ContentConstraintTests.groovy @@ -19,6 +19,10 @@ import grails.test.mixin.integration.IntegrationTestMixin @TestMixin(IntegrationTestMixin) class ContentConstraintTests extends AbstractWeceemIntegrationTest { + public void setUp() { + super.setUp() + } + void testAllContentPropertyConstraintsAreCorrect() { Holders.grailsApplication.domainClasses.each { dca -> def con = dca.clazz.constraints.content