Merge pull request #379 from grails/methodInvokingFactoryBean

Update HibernateDatastoreSpringInitializer

Author: puneetbehl

build.gradle

@@ -51,7 +51,7 @@ if (isReleaseVersion) {
     }
 }
 
-subprojects { project ->
+subprojects { subproject ->
 
     repositories {
         maven { url "https://repo.grails.org/grails/core" }
@@ -70,17 +70,18 @@ subprojects { project ->
     }
 
     ext {
-        isExample = project.name.startsWith('example')
-        isPluginProject = project.name.endsWith("-plugin") && (project.name.startsWith("grails") || project.name.startsWith("rx-"))
-        isGrails3PluginProject = project.name.endsWith("-plugin")
+        isExample = subproject.name.startsWith('example')
+        isPluginProject = subproject.name.endsWith("-plugin") && (subproject.name.startsWith("grails") || subproject.name.startsWith("rx-"))
+        isGrails3PluginProject = subproject.name.endsWith("-plugin")
     }
 
     if(isExample) {
         apply plugin: "groovy"
 
         ext['h2.version'] = h2Version
+        ext['gorm.version'] = gormVersion
 
-        if(project.name.startsWith("examples-grails")) {
+        if(subproject.name.startsWith("examples-grails")) {
             apply plugin:"org.grails.grails-web"
             apply plugin:"org.grails.grails-gsp"
         }
@@ -105,7 +106,7 @@ subprojects { project ->
                 }
             }
         }
-        boolean usesGeb = project.name.contains('examples-grails') 
+        boolean usesGeb = subproject.name.contains('examples-grails')
         if (usesGeb) {
             apply plugin:"com.energizedwork.webdriver-binaries"
         }
@@ -181,14 +182,14 @@ subprojects { project ->
 
     if(isPluginProject) {
         group "org.grails.plugins"
-        version project.rootProject.version - '.RELEASE'
+        version project.version - '.RELEASE'
     }
     else {
         group "org.grails"
-        version project.rootProject.version
+        version project.version
     }
 
-    if(project.name == 'docs') {
+    if(subproject.name == 'docs') {
         return
     }
 

gradle.properties

@@ -2,7 +2,7 @@ assetPipelineVersion=3.3.3
 chromeDriverVersion=2.44
 gebVersion=2.3
 geckodriverVersion=0.23.0
-gormVersion=7.1.0.RC3
+gormVersion=7.1.0-SNAPSHOT
 grailsGradlePluginVersion=5.0.0-RC3
 groovyVersion=3.0.7
 h2Version=1.4.200

grails-plugin/src/main/groovy/grails/orm/bootstrap/HibernateDatastoreSpringInitializer.groovy

@@ -168,7 +168,7 @@ class HibernateDatastoreSpringInitializer extends AbstractDatastoreInitializer {
 
             loadDataServices(null)
                     .each {serviceName, serviceClass->
-                        "$serviceName"(DatastoreServiceMethodInvokingFactoryBean) {
+                        "$serviceName"(DatastoreServiceMethodInvokingFactoryBean, serviceClass) {
                             targetObject = ref("hibernateDatastore")
                             targetMethod = 'getService'
                             arguments = [serviceClass]