(WCM-876) Updated to Grails-2.3.3

OpusCapita · Nov 24, 2013 · 26d67bd · 26d67bd
1 parent 2b99c4c
commit 26d67bd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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