Merge remote-tracking branch 'origin/7.0.x'

Author: puneetbehl

build.gradle

@@ -6,7 +6,7 @@ buildscript {
     dependencies {
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5"
         classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
-        classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.21.2"
+        classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.22.0"
     }
 }
 

grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/config/DatastoreServiceMethodInvokingFactoryBean.groovy

@@ -22,7 +22,10 @@ class DatastoreServiceMethodInvokingFactoryBean extends MethodInvokingFactoryBea
 
     @Override
     Class<?> getObjectType() {
-        arguments[0] as Class<?>
+        if (arguments != null && arguments.size() == 1) {
+            return arguments[0] as Class<?>
+        }
+        return super.getObjectType()
     }
 
     @Override

grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/services/SoftServiceLoader.java

@@ -88,7 +88,7 @@ public static Logger getLogger(Class type) {
      * @return A new service loader
      */
     public static <S> SoftServiceLoader<S> load(Class<S> service) {
-        return SoftServiceLoader.load(service, SoftServiceLoader.class.getClassLoader());
+        return SoftServiceLoader.load(service, Thread.currentThread().getContextClassLoader());
     }
 
     /**

grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.groovy

@@ -333,8 +333,7 @@ abstract class AbstractDatastoreInitializer implements ResourceLoaderAware{
 
     private Class<?> loadServiceClass(Class<Service> clazz) {
         final String serviceClassName = clazz.package.getName() + '.' + clazz.simpleName[1..-15]
-        final ClassLoader cl = org.grails.datastore.mapping.reflect.ClassUtils.classLoader
-        final Class<?> serviceClass = cl.loadClass(serviceClassName)
+        final Class<?> serviceClass = classLoader.loadClass(serviceClassName)
         serviceClass
     }